Merge branch '1.14' into 1.15

1 files changed, 3 insertions, 2 deletions

diff --git a/tasks.py b/tasks.py
index 7c920daf..05654d3b 100644
--- a/tasks.py
+++ b/tasks.py
@@ -9,11 +9,12 @@ from invocations.packaging import publish
 
 # Until we move to spec-based testing
 @task
-def test(ctx, coverage=False):
+def test(ctx, coverage=False, flags=""):
+    if "--verbose" not in flags.split():
+        flags += " --verbose"
     runner = "python"
     if coverage:
         runner = "coverage run --source=paramiko"
-    flags = "--verbose"
     ctx.run("{0} test.py {1}".format(runner, flags), pty=True)