black: Reformat without skipping string normalization.
This commit is contained in:
parent
fba21bb00d
commit
6f3f9bf7e4
178 changed files with 5242 additions and 5242 deletions
|
@ -13,7 +13,7 @@ class BotServerTestCase(TestCase):
|
|||
server.app.testing = True
|
||||
self.app = server.app.test_client()
|
||||
|
||||
@mock.patch('zulip_bots.lib.ExternalBotHandler')
|
||||
@mock.patch("zulip_bots.lib.ExternalBotHandler")
|
||||
def assert_bot_server_response(
|
||||
self,
|
||||
mock_ExternalBotHandler: mock.Mock,
|
||||
|
|
|
@ -19,58 +19,58 @@ from .server_test_lib import BotServerTestCase
|
|||
class BotServerTests(BotServerTestCase):
|
||||
class MockMessageHandler:
|
||||
def handle_message(self, message: Dict[str, str], bot_handler: BotHandler) -> None:
|
||||
assert message == {'key': "test message"}
|
||||
assert message == {"key": "test message"}
|
||||
|
||||
class MockLibModule:
|
||||
def handler_class(self) -> Any:
|
||||
return BotServerTests.MockMessageHandler()
|
||||
|
||||
def test_successful_request(self) -> None:
|
||||
available_bots = ['helloworld']
|
||||
available_bots = ["helloworld"]
|
||||
bots_config = {
|
||||
'helloworld': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': '123456789qwertyuiop',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"helloworld": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "123456789qwertyuiop",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
}
|
||||
self.assert_bot_server_response(
|
||||
available_bots=available_bots,
|
||||
bots_config=bots_config,
|
||||
event=dict(
|
||||
message={'content': "@**test** test message"},
|
||||
bot_email='helloworld-bot@zulip.com',
|
||||
trigger='mention',
|
||||
token='abcd1234',
|
||||
message={"content": "@**test** test message"},
|
||||
bot_email="helloworld-bot@zulip.com",
|
||||
trigger="mention",
|
||||
token="abcd1234",
|
||||
),
|
||||
expected_response="beep boop",
|
||||
check_success=True,
|
||||
)
|
||||
|
||||
def test_successful_request_from_two_bots(self) -> None:
|
||||
available_bots = ['helloworld', 'help']
|
||||
available_bots = ["helloworld", "help"]
|
||||
bots_config = {
|
||||
'helloworld': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': '123456789qwertyuiop',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"helloworld": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "123456789qwertyuiop",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
},
|
||||
'help': {
|
||||
'email': 'help-bot@zulip.com',
|
||||
'key': '123456789qwertyuiop',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"help": {
|
||||
"email": "help-bot@zulip.com",
|
||||
"key": "123456789qwertyuiop",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
},
|
||||
}
|
||||
self.assert_bot_server_response(
|
||||
available_bots=available_bots,
|
||||
event=dict(
|
||||
message={'content': "@**test** test message"},
|
||||
bot_email='helloworld-bot@zulip.com',
|
||||
trigger='mention',
|
||||
token='abcd1234',
|
||||
message={"content": "@**test** test message"},
|
||||
bot_email="helloworld-bot@zulip.com",
|
||||
trigger="mention",
|
||||
token="abcd1234",
|
||||
),
|
||||
expected_response="beep boop",
|
||||
bots_config=bots_config,
|
||||
|
@ -79,54 +79,54 @@ class BotServerTests(BotServerTestCase):
|
|||
|
||||
def test_request_for_unkown_bot(self) -> None:
|
||||
bots_config = {
|
||||
'helloworld': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': '123456789qwertyuiop',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"helloworld": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "123456789qwertyuiop",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
},
|
||||
}
|
||||
self.assert_bot_server_response(
|
||||
available_bots=['helloworld'],
|
||||
event=dict(message={'content': "test message"}, bot_email='unknown-bot@zulip.com'),
|
||||
available_bots=["helloworld"],
|
||||
event=dict(message={"content": "test message"}, bot_email="unknown-bot@zulip.com"),
|
||||
bots_config=bots_config,
|
||||
check_success=False,
|
||||
)
|
||||
|
||||
def test_wrong_bot_token(self) -> None:
|
||||
available_bots = ['helloworld']
|
||||
available_bots = ["helloworld"]
|
||||
bots_config = {
|
||||
'helloworld': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': '123456789qwertyuiop',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"helloworld": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "123456789qwertyuiop",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
}
|
||||
self.assert_bot_server_response(
|
||||
available_bots=available_bots,
|
||||
bots_config=bots_config,
|
||||
event=dict(
|
||||
message={'content': "@**test** test message"},
|
||||
bot_email='helloworld-bot@zulip.com',
|
||||
trigger='mention',
|
||||
token='wrongtoken',
|
||||
message={"content": "@**test** test message"},
|
||||
bot_email="helloworld-bot@zulip.com",
|
||||
trigger="mention",
|
||||
token="wrongtoken",
|
||||
),
|
||||
check_success=False,
|
||||
)
|
||||
|
||||
@mock.patch('logging.error')
|
||||
@mock.patch('zulip_bots.lib.StateHandler')
|
||||
@mock.patch("logging.error")
|
||||
@mock.patch("zulip_bots.lib.StateHandler")
|
||||
def test_wrong_bot_credentials(
|
||||
self, mock_StateHandler: mock.Mock, mock_LoggingError: mock.Mock
|
||||
) -> None:
|
||||
available_bots = ['nonexistent-bot']
|
||||
available_bots = ["nonexistent-bot"]
|
||||
bots_config = {
|
||||
'nonexistent-bot': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': '123456789qwertyuiop',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"nonexistent-bot": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "123456789qwertyuiop",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
}
|
||||
# This works, but mypy still complains:
|
||||
|
@ -135,26 +135,26 @@ class BotServerTests(BotServerTestCase):
|
|||
with self.assertRaisesRegexp(
|
||||
SystemExit,
|
||||
'Error: Bot "nonexistent-bot" doesn\'t exist. Please make '
|
||||
'sure you have set up the botserverrc file correctly.',
|
||||
"sure you have set up the botserverrc file correctly.",
|
||||
):
|
||||
self.assert_bot_server_response(
|
||||
available_bots=available_bots,
|
||||
event=dict(
|
||||
message={'content': "@**test** test message"},
|
||||
bot_email='helloworld-bot@zulip.com',
|
||||
trigger='mention',
|
||||
token='abcd1234',
|
||||
message={"content": "@**test** test message"},
|
||||
bot_email="helloworld-bot@zulip.com",
|
||||
trigger="mention",
|
||||
token="abcd1234",
|
||||
),
|
||||
bots_config=bots_config,
|
||||
)
|
||||
|
||||
@mock.patch('sys.argv', ['zulip-botserver', '--config-file', '/foo/bar/baz.conf'])
|
||||
@mock.patch("sys.argv", ["zulip-botserver", "--config-file", "/foo/bar/baz.conf"])
|
||||
def test_argument_parsing_defaults(self) -> None:
|
||||
opts = parse_args()
|
||||
assert opts.config_file == '/foo/bar/baz.conf'
|
||||
assert opts.config_file == "/foo/bar/baz.conf"
|
||||
assert opts.bot_name is None
|
||||
assert opts.bot_config_file is None
|
||||
assert opts.hostname == '127.0.0.1'
|
||||
assert opts.hostname == "127.0.0.1"
|
||||
assert opts.port == 5002
|
||||
|
||||
def test_read_config_from_env_vars(self) -> None:
|
||||
|
@ -162,29 +162,29 @@ class BotServerTests(BotServerTestCase):
|
|||
# the stringified environment variable is standard even on
|
||||
# Python 3.7 and earlier.
|
||||
bots_config = OrderedDict()
|
||||
bots_config['hello_world'] = {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': 'value',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
bots_config["hello_world"] = {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "value",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
bots_config['giphy'] = {
|
||||
'email': 'giphy-bot@zulip.com',
|
||||
'key': 'value2',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
bots_config["giphy"] = {
|
||||
"email": "giphy-bot@zulip.com",
|
||||
"key": "value2",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
os.environ['ZULIP_BOTSERVER_CONFIG'] = json.dumps(bots_config)
|
||||
os.environ["ZULIP_BOTSERVER_CONFIG"] = json.dumps(bots_config)
|
||||
|
||||
# No bot specified; should read all bot configs
|
||||
assert server.read_config_from_env_vars() == bots_config
|
||||
|
||||
# Specified bot exists; should read only that section.
|
||||
assert server.read_config_from_env_vars("giphy") == {'giphy': bots_config['giphy']}
|
||||
assert server.read_config_from_env_vars("giphy") == {"giphy": bots_config["giphy"]}
|
||||
|
||||
# Specified bot doesn't exist; should read the first section of the config.
|
||||
assert server.read_config_from_env_vars("redefined_bot") == {
|
||||
'redefined_bot': bots_config['hello_world']
|
||||
"redefined_bot": bots_config["hello_world"]
|
||||
}
|
||||
|
||||
def test_read_config_file(self) -> None:
|
||||
|
@ -195,17 +195,17 @@ class BotServerTests(BotServerTestCase):
|
|||
# No bot specified; should read all bot configs.
|
||||
bot_conf1 = server.read_config_file(os.path.join(current_dir, "test.conf"))
|
||||
expected_config1 = {
|
||||
'helloworld': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': 'value',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"helloworld": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "value",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
},
|
||||
'giphy': {
|
||||
'email': 'giphy-bot@zulip.com',
|
||||
'key': 'value2',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"giphy": {
|
||||
"email": "giphy-bot@zulip.com",
|
||||
"key": "value2",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
},
|
||||
}
|
||||
assert json.dumps(bot_conf1, sort_keys=True) == json.dumps(expected_config1, sort_keys=True)
|
||||
|
@ -213,11 +213,11 @@ class BotServerTests(BotServerTestCase):
|
|||
# Specified bot exists; should read only that section.
|
||||
bot_conf3 = server.read_config_file(os.path.join(current_dir, "test.conf"), "giphy")
|
||||
expected_config3 = {
|
||||
'giphy': {
|
||||
'email': 'giphy-bot@zulip.com',
|
||||
'key': 'value2',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"giphy": {
|
||||
"email": "giphy-bot@zulip.com",
|
||||
"key": "value2",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
}
|
||||
assert json.dumps(bot_conf3, sort_keys=True) == json.dumps(expected_config3, sort_keys=True)
|
||||
|
@ -225,11 +225,11 @@ class BotServerTests(BotServerTestCase):
|
|||
# Specified bot doesn't exist; should read the first section of the config.
|
||||
bot_conf2 = server.read_config_file(os.path.join(current_dir, "test.conf"), "redefined_bot")
|
||||
expected_config2 = {
|
||||
'redefined_bot': {
|
||||
'email': 'helloworld-bot@zulip.com',
|
||||
'key': 'value',
|
||||
'site': 'http://localhost',
|
||||
'token': 'abcd1234',
|
||||
"redefined_bot": {
|
||||
"email": "helloworld-bot@zulip.com",
|
||||
"key": "value",
|
||||
"site": "http://localhost",
|
||||
"token": "abcd1234",
|
||||
}
|
||||
}
|
||||
assert json.dumps(bot_conf2, sort_keys=True) == json.dumps(expected_config2, sort_keys=True)
|
||||
|
@ -238,18 +238,18 @@ class BotServerTests(BotServerTestCase):
|
|||
# This testcase requires hardcoded paths, which here is a good thing so if we ever
|
||||
# restructure zulip_bots, this test would fail and we would also update Botserver
|
||||
# at the same time.
|
||||
helloworld = import_module('zulip_bots.bots.{bot}.{bot}'.format(bot='helloworld'))
|
||||
helloworld = import_module("zulip_bots.bots.{bot}.{bot}".format(bot="helloworld"))
|
||||
root_dir = Path(__file__).parents[2].as_posix()
|
||||
# load valid module name
|
||||
module = server.load_lib_modules(['helloworld'])['helloworld']
|
||||
module = server.load_lib_modules(["helloworld"])["helloworld"]
|
||||
assert module == helloworld
|
||||
|
||||
# load valid file path
|
||||
path = Path(
|
||||
root_dir, 'zulip_bots/zulip_bots/bots/{bot}/{bot}.py'.format(bot='helloworld')
|
||||
root_dir, "zulip_bots/zulip_bots/bots/{bot}/{bot}.py".format(bot="helloworld")
|
||||
).as_posix()
|
||||
module = server.load_lib_modules([path])[path]
|
||||
assert module.__name__ == 'custom_bot_module'
|
||||
assert module.__name__ == "custom_bot_module"
|
||||
assert module.__file__ == path
|
||||
assert isinstance(module, ModuleType)
|
||||
|
||||
|
@ -257,23 +257,23 @@ class BotServerTests(BotServerTestCase):
|
|||
with self.assertRaisesRegexp(
|
||||
SystemExit,
|
||||
'Error: Bot "botserver-test-case-random-bot" doesn\'t exist. '
|
||||
'Please make sure you have set up the botserverrc file correctly.',
|
||||
"Please make sure you have set up the botserverrc file correctly.",
|
||||
):
|
||||
module = server.load_lib_modules(['botserver-test-case-random-bot'])[
|
||||
'botserver-test-case-random-bot'
|
||||
module = server.load_lib_modules(["botserver-test-case-random-bot"])[
|
||||
"botserver-test-case-random-bot"
|
||||
]
|
||||
|
||||
# load invalid file path
|
||||
with self.assertRaisesRegexp(
|
||||
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),
|
||||
"Please make sure you have set up the botserverrc file correctly.".format(root_dir),
|
||||
):
|
||||
path = Path(
|
||||
root_dir, 'zulip_bots/zulip_bots/bots/{bot}.py'.format(bot='helloworld')
|
||||
root_dir, "zulip_bots/zulip_bots/bots/{bot}.py".format(bot="helloworld")
|
||||
).as_posix()
|
||||
module = server.load_lib_modules([path])[path]
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue