Merge pull request #4991 from blueyed/fix-tests

Fix pytest's own tests with `-W error::ResourceWarning`

testing/python/fixture.py

@@ -1103,6 +1103,7 @@ class TestFixtureUsages(object):
         values = reprec.getfailedcollections()
         assert len(values) == 1
 
+    @pytest.mark.filterwarnings("ignore::pytest.PytestDeprecationWarning")
     def test_request_can_be_overridden(self, testdir):
         testdir.makepyfile(
             """

testing/test_session.py

@@ -116,7 +116,8 @@ class SessionTests(object):
             class TestBrokenClass(object):
                 def test_explicit_bad_repr(self):
                     t = BrokenRepr1()
-                    pytest.raises(Exception, 'repr(t)')
+                    with pytest.raises(Exception, match="I'm a broken repr"):
+                        repr(t)
 
                 def test_implicit_bad_repr1(self):
                     t = BrokenRepr1()