Merge pull request #3565 from nicoddemus/xfail-test-request-garbage

Attempt to fix test_request_garbage on Windows
pytest-dev · Jun 11, 2018 · 04b65cf · 04b65cf
2 parents 61471df + 5ea647a
commit 04b65cf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/testing/python/fixture.py b/testing/python/fixture.py
@@ -630,7 +630,7 @@ def test_request_garbage(self, testdir):
             """
             import sys
             import pytest
-            from _pytest.compat import safe_str
+            from _pytest.fixtures import PseudoFixtureDef
             import gc
 
             @pytest.fixture(autouse=True)
@@ -647,7 +647,7 @@ def something(request):
 
                     gc.collect()
                     leaked_types = sum(1 for _ in gc.garbage
-                                       if 'PseudoFixtureDef' in safe_str(_))
+                                       if isinstance(_, PseudoFixtureDef))
 
                     gc.garbage[:] = []