summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--igor.py1
-rw-r--r--requirements/pytest.pip1
-rw-r--r--setup.cfg2
-rw-r--r--tests/test_concurrency.py3
4 files changed, 6 insertions, 1 deletions
diff --git a/igor.py b/igor.py
index 9d2d43a0..c875a6f9 100644
--- a/igor.py
+++ b/igor.py
@@ -28,6 +28,7 @@ warnings.simplefilter("default")
# Silence specific warnings that are not our fault.
warnings.filterwarnings("ignore", module="xdist", message="type argument to addoption")
+warnings.filterwarnings("ignore", module="flaky", message="type argument to addoption")
warnings.filterwarnings(
# https://github.com/pytest-dev/pytest/issues/2118
"ignore",
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index e2e70090..274168ff 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -5,3 +5,4 @@
pytest==3.0.5
pytest-xdist==1.15.0
pytest-warnings==0.2.0
+flaky==3.3.0
diff --git a/setup.cfg b/setup.cfg
index c88d0160..07eb45cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[tool:pytest]
-addopts = -q -n3 --strict
+addopts = -q -n3 --strict --no-success-flaky-report
markers =
expensive: too slow to run during "make smoke"
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index a7dac064..f2aa7977 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -5,6 +5,8 @@
import threading
+from flaky import flaky
+
import coverage
from coverage import env
from coverage.files import abs_file
@@ -349,6 +351,7 @@ MULTI_CODE = """
"""
+@flaky # Sometimes a test fails due to inherent randomness. Try one more time.
class MultiprocessingTest(CoverageTest):
"""Test support of the multiprocessing module."""