summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-09-18 16:07:53 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-09-18 16:07:53 -0700
commitcbbf7106f8c6e2b0275fc65f17c8c419a2028d8a (patch)
treef0266f9925f8fb35541b1b04274886e4e5c5cd42
parent7fb72ec3b4824399e2dce4b4faf59f519ad49013 (diff)
downloadparamiko-cbbf7106f8c6e2b0275fc65f17c8c419a2028d8a.tar.gz
Revert attempts to run Kerberos tests :(
-rw-r--r--.travis.yml3
-rw-r--r--kerberos-requirements.txt2
-rw-r--r--tasks.py4
3 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 604b6fd2..a9a04c89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,9 @@ install:
# Dev (doc/test running) requirements
- pip install coveralls # For coveralls.io specifically
- pip install -r dev-requirements.txt
- - pip install -r kerberos-requirements.txt # for GSSAPI tests
script:
# Main tests, with coverage!
- - inv test --coverage --kerberos
+ - inv test --coverage
# Ensure documentation & invoke pipeline run OK.
# Run 'docs' first since its objects.inv is referred to by 'www'.
# Also force warnings to be errors since most of them tend to be actual
diff --git a/kerberos-requirements.txt b/kerberos-requirements.txt
deleted file mode 100644
index 0e8c156a..00000000
--- a/kerberos-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pyasn1>=0.1.7
-python-gssapi>=0.6.1
diff --git a/tasks.py b/tasks.py
index 68912ce0..b236ee42 100644
--- a/tasks.py
+++ b/tasks.py
@@ -27,13 +27,11 @@ www = Collection.from_module(_docs, name='www', config={
# Until we move to spec-based testing
@task
-def test(ctx, kerberos=False, coverage=False):
+def test(ctx, coverage=False):
runner = "python"
if coverage:
runner = "coverage run --source=paramiko"
flags = "--verbose"
- if kerberos:
- flags += " --gssapi-test --test-gssauth --test-gssapi-keyex"
ctx.run("{0} test.py {1}".format(runner, flags), pty=True)