From 0928ee09e973c50f3e5f322a518eb0a2daa7893d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 4 Jun 2022 11:05:40 +0300 Subject: Replace deprecated assertRaisesRegexp with assertRaisesRegex --- testtools/tests/test_testcase.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'testtools/tests/test_testcase.py') diff --git a/testtools/tests/test_testcase.py b/testtools/tests/test_testcase.py index 9f8d194..f75f245 100644 --- a/testtools/tests/test_testcase.py +++ b/testtools/tests/test_testcase.py @@ -386,24 +386,24 @@ class TestAssertions(TestCase): Raises( MatchesException(self.failureException, '.*{!r}.*'.format(foo)))) - def test_assertRaisesRegexp(self): - # assertRaisesRegexp asserts that function raises particular exception + def test_assertRaisesRegex(self): + # assertRaisesRegex asserts that function raises particular exception # with particular message. - self.assertRaisesRegexp(RuntimeError, r"M\w*e", self.raiseError, - RuntimeError, "Message") + self.assertRaisesRegex(RuntimeError, r"M\w*e", self.raiseError, + RuntimeError, "Message") - def test_assertRaisesRegexp_wrong_error_type(self): + def test_assertRaisesRegex_wrong_error_type(self): # If function raises an exception of unexpected type, - # assertRaisesRegexp re-raises it. - self.assertRaises(ValueError, self.assertRaisesRegexp, RuntimeError, + # assertRaisesRegex re-raises it. + self.assertRaises(ValueError, self.assertRaisesRegex, RuntimeError, r"M\w*e", self.raiseError, ValueError, "Message") - def test_assertRaisesRegexp_wrong_message(self): + def test_assertRaisesRegex_wrong_message(self): # If function raises an exception with unexpected message - # assertRaisesRegexp fails. + # assertRaisesRegex fails. self.assertFails( '"Expected" does not match "Observed"', - self.assertRaisesRegexp, RuntimeError, "Expected", + self.assertRaisesRegex, RuntimeError, "Expected", self.raiseError, RuntimeError, "Observed") def assertFails(self, message, function, *args, **kwargs): -- cgit v1.2.1 From 8e3e36002a648a11cf0ee8a2b93b3ef813e7db05 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 4 Jun 2022 11:43:47 +0300 Subject: Fix DeprecationWarning: Only valid in 1.8.1 and earlier. Use skipTest instead. --- testtools/tests/test_testcase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testtools/tests/test_testcase.py') diff --git a/testtools/tests/test_testcase.py b/testtools/tests/test_testcase.py index f75f245..abb05cb 100644 --- a/testtools/tests/test_testcase.py +++ b/testtools/tests/test_testcase.py @@ -1455,7 +1455,7 @@ class TestSkipping(TestCase): def test_skip_causes_skipException(self): self.assertThat( - lambda: self.skip("Skip this test"), + lambda: self.skipTest("Skip this test"), Raises(MatchesException(self.skipException))) def test_can_use_skipTest(self): -- cgit v1.2.1