From a146374936f5eb8f4736af3f7297117cdf5d291b Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Thu, 18 Sep 2014 15:18:51 -0700
Subject: Add ability to run Kerberos tests to the test runner.

Includes merging coverage task into test task
---
 tasks.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'tasks.py')

diff --git a/tasks.py b/tasks.py
index cf43a5fd..68912ce0 100644
--- a/tasks.py
+++ b/tasks.py
@@ -27,12 +27,14 @@ www = Collection.from_module(_docs, name='www', config={
 
 # Until we move to spec-based testing
 @task
-def test(ctx):
-    ctx.run("python test.py --verbose", pty=True)
-
-@task
-def coverage(ctx):
-    ctx.run("coverage run --source=paramiko test.py --verbose")
+def test(ctx, kerberos=False, 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)
 
 
 # Until we stop bundling docs w/ releases. Need to discover use cases first.
@@ -48,4 +50,4 @@ def release(ctx):
     publish(ctx, wheel=True)
 
 
-ns = Collection(test, coverage, release, docs=docs, www=www)
+ns = Collection(test, release, docs=docs, www=www)
-- 
cgit v1.2.3


From cbbf7106f8c6e2b0275fc65f17c8c419a2028d8a Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Thu, 18 Sep 2014 16:07:53 -0700
Subject: Revert attempts to run Kerberos tests :(

---
 .travis.yml               | 3 +--
 kerberos-requirements.txt | 2 --
 tasks.py                  | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 kerberos-requirements.txt

(limited to 'tasks.py')

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)
 
 
-- 
cgit v1.2.3