Add pytest markers list
@@ -32,10 +32,10 @@ concurrency = gevent
[tool:pytest]
-# Temp tune this next line down to find the slow unittest(s).
-# unittests should each all run well under a second.
-# (timeout is in seconds)
-timeout = 300
-
# Skip end-to-end tests by default
addopts = -m'not end_to_end'
+markers =
+ end_to_end
+ end_to_end_docker
+ end_to_end_local
+ end_to_end_ssh
