Merge pull request #14462 from anntzer/timeout

tacaswell · web-flow · commit 666d3d09b53e · 2019-06-06T17:04:33.000-04:00
TST: Register timeout pytest marker.
diff --git a/pytest.ini b/pytest.ini
@@ -6,6 +6,7 @@ python_files = test_*.py
 
 markers =
     flaky: (Provided by pytest-rerunfailures.)
+    timeout: (Provided by pytest-timeout.)
     backend: Set alternate Matplotlib backend temporarily.
     style: Set alternate Matplotlib style temporarily.
     baseline_images: Compare output against a known reference.
