From e8bb65b188a6d257c35e49ade5d15f0ad848c3ac Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 24 Aug 2021 17:20:51 -0700 Subject: [PATCH] tests: Replace deprecated assertRaisesRegexp with assertRaisesRegex. Signed-off-by: Anders Kaseorg --- zulip_bots/zulip_bots/test_lib.py | 2 +- zulip_botserver/tests/test_server.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/zulip_bots/zulip_bots/test_lib.py b/zulip_bots/zulip_bots/test_lib.py index c377ee0..dd2e4ae 100755 --- a/zulip_bots/zulip_bots/test_lib.py +++ b/zulip_bots/zulip_bots/test_lib.py @@ -154,7 +154,7 @@ class BotTestCase(unittest.TestCase): def validate_invalid_config(self, config_data: Dict[str, str], error_regexp: str) -> None: bot_class = type(get_bot_message_handler(self.bot_name)) - with self.assertRaisesRegexp(ConfigValidationError, error_regexp): + with self.assertRaisesRegex(ConfigValidationError, error_regexp): bot_class.validate_config(config_data) def validate_valid_config(self, config_data: Dict[str, str]) -> None: diff --git a/zulip_botserver/tests/test_server.py b/zulip_botserver/tests/test_server.py index 59367f7..9022e92 100644 --- a/zulip_botserver/tests/test_server.py +++ b/zulip_botserver/tests/test_server.py @@ -129,10 +129,7 @@ class BotServerTests(BotServerTestCase): "token": "abcd1234", } } - # This works, but mypy still complains: - # error: No overload variant of "assertRaisesRegexp" of "TestCase" matches argument types - # [def (*args: builtins.object, **kwargs: builtins.object) -> builtins.SystemExit, builtins.str] - with self.assertRaisesRegexp( + with self.assertRaisesRegex( SystemExit, 'Error: Bot "nonexistent-bot" doesn\'t exist. Please make ' "sure you have set up the botserverrc file correctly.", @@ -254,7 +251,7 @@ class BotServerTests(BotServerTestCase): assert isinstance(module, ModuleType) # load invalid module name - with self.assertRaisesRegexp( + with self.assertRaisesRegex( SystemExit, 'Error: Bot "botserver-test-case-random-bot" doesn\'t exist. ' "Please make sure you have set up the botserverrc file correctly.", @@ -264,7 +261,7 @@ class BotServerTests(BotServerTestCase): ] # load invalid file path - with self.assertRaisesRegexp( + with self.assertRaisesRegex( SystemExit, 'Error: Bot "{}/zulip_bots/zulip_bots/bots/helloworld.py" doesn\'t exist. ' "Please make sure you have set up the botserverrc file correctly.".format(root_dir),