summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-09-17 15:15:40 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-09-17 15:15:40 -0700
commitfc13095e2b2f930844c89654c63fedd21c8de076 (patch)
tree054a4a406b182f1cb2e1c99eac261b91f4b296a7
parent7b92847a2db0a25960310318c29dfcc57fc6e984 (diff)
downloadparamiko-fc13095e2b2f930844c89654c63fedd21c8de076.tar.gz
Non-git cherry-pick of modern pytest hints.
Required to turn off pytest-relaxed when it's installed locally (since later versions pull it in for its utils), and may as well just yank rest for now too. Should merge-up cleanly?
-rw-r--r--setup.cfg7
1 files changed, 7 insertions, 0 deletions
diff --git a/setup.cfg b/setup.cfg
index 8cc271fe..245b77f2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,3 +11,10 @@ omit = paramiko/_winapi.py
exclude = sites,.git,build,dist,demos,tests
ignore = E124,E125,E128,E261,E301,E302,E303,E402
max-line-length = 79
+
+[tool:pytest]
+# We use pytest-relaxed just for its utils at the moment, so disable it at the
+# plugin level until we adapt test organization to really use it.
+addopts = -p no:relaxed
+# Loop on failure
+looponfailroots = tests paramiko