diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2020-08-16 00:24:19 -0700 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2020-08-16 16:49:07 -0700 |
| commit | d5b17e1912cc4df7c8f6ab4daf78d72ab4c01de1 (patch) | |
| tree | 65593add0806f3f1bf77efa728cbe0bfb91cea59 | |
| parent | bdb0f369733618222ec85bbc6e14ca0f910d12f9 (diff) | |
| download | waitress-d5b17e1912cc4df7c8f6ab4daf78d72ab4c01de1.tar.gz | |
Fixup deprecation warnings
| -rw-r--r-- | tests/test_adjustments.py | 3 | ||||
| -rw-r--r-- | tests/test_runner.py | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/tests/test_adjustments.py b/tests/test_adjustments.py index 6347be3..6aafaa8 100644 --- a/tests/test_adjustments.py +++ b/tests/test_adjustments.py @@ -404,6 +404,9 @@ class TestCLI(unittest.TestCase): return Adjustments.parse_args(argv) + def assertDictContainsSubset(self, subset, dictionary): + self.assertTrue(set(subset.items()) <= set(dictionary.items())) + def test_noargs(self): opts, args = self.parse([]) self.assertDictEqual(opts, {"call": False, "help": False}) diff --git a/tests/test_runner.py b/tests/test_runner.py index 2ac302c..4cf6f6f 100644 --- a/tests/test_runner.py +++ b/tests/test_runner.py @@ -12,17 +12,17 @@ from waitress import runner class Test_match(unittest.TestCase): def test_empty(self): - self.assertRaisesRegexp( + self.assertRaisesRegex( ValueError, "^Malformed application ''$", runner.match, "" ) def test_module_only(self): - self.assertRaisesRegexp( + self.assertRaisesRegex( ValueError, r"^Malformed application 'foo\.bar'$", runner.match, "foo.bar" ) def test_bad_module(self): - self.assertRaisesRegexp( + self.assertRaisesRegex( ValueError, r"^Malformed application 'foo#bar:barney'$", runner.match, @@ -42,7 +42,7 @@ class Test_resolve(unittest.TestCase): ) def test_nonexistent_function(self): - self.assertRaisesRegexp( + self.assertRaisesRegex( AttributeError, r"has no attribute 'nonexistent_function'", runner.resolve, @@ -57,7 +57,7 @@ class Test_resolve(unittest.TestCase): def test_complex_happy_path(self): # Ensure we can recursively resolve object attributes if necessary. - self.assertEquals(runner.resolve("os.path", "exists.__name__"), "exists") + self.assertEqual(runner.resolve("os.path", "exists.__name__"), "exists") class Test_run(unittest.TestCase): @@ -65,7 +65,7 @@ class Test_run(unittest.TestCase): argv = ["waitress-serve"] + argv with capture() as captured: self.assertEqual(runner.run(argv=argv), code) - self.assertRegexpMatches(captured.getvalue(), regex) + self.assertRegex(captured.getvalue(), regex) captured.close() def test_bad(self): @@ -162,7 +162,7 @@ class Test_helper(unittest.TestCase): raise ImportError("My reason") except ImportError: self.assertEqual(show_exception(sys.stderr), None) - self.assertRegexpMatches(captured.getvalue(), regex) + self.assertRegex(captured.getvalue(), regex) captured.close() regex = ( @@ -175,7 +175,7 @@ class Test_helper(unittest.TestCase): raise ImportError except ImportError: self.assertEqual(show_exception(sys.stderr), None) - self.assertRegexpMatches(captured.getvalue(), regex) + self.assertRegex(captured.getvalue(), regex) captured.close() |