Merge pull request #4144 from nicoddemus/fix-flaky-durations-test

Fix flaky durations test

Author: nicoddemus

testing/acceptance_test.py

@@ -808,7 +808,6 @@ def test_calls(self, testdir):
         result.stdout.fnmatch_lines_random(
             ["*durations*", "*call*test_3*", "*call*test_2*"]
         )
-        assert "test_something" not in result.stdout.str()
         result.stdout.fnmatch_lines(
             ["(0.00 durations hidden.  Use -vv to show these durations.)"]
         )

testing/python/fixture.py

@@ -494,6 +494,12 @@ def test_method(self, something):
         reason="this method of test doesn't work on pypy",
     )
     def test_request_garbage(self, testdir):
+        try:
+            import xdist  # noqa
+        except ImportError:
+            pass
+        else:
+            pytest.xfail("this test is flaky when executed with xdist")
         testdir.makepyfile(
             """
             import sys