diff --git a/tests/mqtt/protocol/test_handler.py b/tests/mqtt/protocol/test_handler.py index 4e77c67..f0c27d9 100644 --- a/tests/mqtt/protocol/test_handler.py +++ b/tests/mqtt/protocol/test_handler.py @@ -334,11 +334,11 @@ class ProtocolHandlerTest(unittest.TestCase): self.check_empty_waiters(handler) self.check_no_message(session) await handler.start() - self.assertTrue(handler._reader_ready) + assert handler._reader_ready async def stop_handler(self, handler, session): await handler.stop() - self.assertTrue(handler._reader_stopped) + assert handler._reader_stopped self.check_empty_waiters(handler) self.check_no_message(session) diff --git a/tests/mqtt/test_connect.py b/tests/mqtt/test_connect.py index 12f99d0..4363293 100644 --- a/tests/mqtt/test_connect.py +++ b/tests/mqtt/test_connect.py @@ -19,12 +19,12 @@ class ConnectPacketTest(unittest.TestCase): message = self.loop.run_until_complete(ConnectPacket.from_stream(stream)) self.assertEqual(message.variable_header.proto_name, "MQTT") self.assertEqual(message.variable_header.proto_level, 4) - self.assertTrue(message.variable_header.username_flag) - self.assertTrue(message.variable_header.password_flag) + assert message.variable_header.username_flag + assert message.variable_header.password_flag self.assertFalse(message.variable_header.will_retain_flag) self.assertEqual(message.variable_header.will_qos, 1) - self.assertTrue(message.variable_header.will_flag) - self.assertTrue(message.variable_header.clean_session_flag) + assert message.variable_header.will_flag + assert message.variable_header.clean_session_flag self.assertFalse(message.variable_header.reserved_flag) self.assertEqual(message.payload.client_id, '0123456789') self.assertEqual(message.payload.will_topic, 'WillTopic') @@ -38,12 +38,12 @@ class ConnectPacketTest(unittest.TestCase): message = self.loop.run_until_complete(ConnectPacket.from_stream(stream)) self.assertEqual(message.variable_header.proto_name, "MQTT") self.assertEqual(message.variable_header.proto_level, 4) - self.assertTrue(message.variable_header.username_flag) - self.assertTrue(message.variable_header.password_flag) + assert message.variable_header.username_flag + assert message.variable_header.password_flag self.assertFalse(message.variable_header.will_retain_flag) self.assertEqual(message.variable_header.will_qos, 1) self.assertFalse(message.variable_header.will_flag) - self.assertTrue(message.variable_header.clean_session_flag) + assert message.variable_header.clean_session_flag self.assertFalse(message.variable_header.reserved_flag) self.assertEqual(message.payload.client_id, '0123456789') self.assertEqual(message.payload.will_topic, None) @@ -55,7 +55,7 @@ class ConnectPacketTest(unittest.TestCase): data = b'\x10\x3e\x00\x04MQTT\x04\xcf\x00\x00\x00\x0a0123456789\x00\x09WillTopic\x00\x0bWillMessage\x00\x04user\x00\x08password' stream = BufferReader(data) message = self.loop.run_until_complete(ConnectPacket.from_stream(stream)) - self.assertTrue(message.variable_header.reserved_flag) + assert message.variable_header.reserved_flag def test_decode_fail_miss_clientId(self): data = b'\x10\x0a\x00\x04MQTT\x04\xce\x00\x00' @@ -97,18 +97,18 @@ class ConnectPacketTest(unittest.TestCase): self.assertEqual(message.proto_name, "MQTT") self.assertEqual(message.variable_header.proto_level, 4) self.assertEqual(message.proto_level, 4) - self.assertTrue(message.variable_header.username_flag) - self.assertTrue(message.username_flag) - self.assertTrue(message.variable_header.password_flag) - self.assertTrue(message.password_flag) + assert message.variable_header.username_flag + assert message.username_flag + assert message.variable_header.password_flag + assert message.password_flag self.assertFalse(message.variable_header.will_retain_flag) self.assertFalse(message.will_retain_flag) self.assertEqual(message.variable_header.will_qos, 1) self.assertEqual(message.will_qos, 1) - self.assertTrue(message.variable_header.will_flag) - self.assertTrue(message.will_flag) - self.assertTrue(message.variable_header.clean_session_flag) - self.assertTrue(message.clean_session_flag) + assert message.variable_header.will_flag + assert message.will_flag + assert message.variable_header.clean_session_flag + assert message.clean_session_flag self.assertFalse(message.variable_header.reserved_flag) self.assertFalse(message.reserved_flag) self.assertEqual(message.payload.client_id, '0123456789') diff --git a/tests/plugins/test_authentication.py b/tests/plugins/test_authentication.py index 6ca44e8..43d27a2 100644 --- a/tests/plugins/test_authentication.py +++ b/tests/plugins/test_authentication.py @@ -30,7 +30,7 @@ class TestAnonymousAuthPlugin(unittest.TestCase): s.username = "" auth_plugin = AnonymousAuthPlugin(context) ret = self.loop.run_until_complete(auth_plugin.authenticate(session=s)) - self.assertTrue(ret) + assert ret def test_disallow_anonymous(self): context = BaseContext() @@ -58,7 +58,7 @@ class TestAnonymousAuthPlugin(unittest.TestCase): s.username = "test" auth_plugin = AnonymousAuthPlugin(context) ret = self.loop.run_until_complete(auth_plugin.authenticate(session=s)) - self.assertTrue(ret) + assert ret class TestFileAuthPlugin(unittest.TestCase): @@ -78,7 +78,7 @@ class TestFileAuthPlugin(unittest.TestCase): s.password = "test" auth_plugin = FileAuthPlugin(context) ret = self.loop.run_until_complete(auth_plugin.authenticate(session=s)) - self.assertTrue(ret) + assert ret def test_wrong_password(self): context = BaseContext() diff --git a/tests/plugins/test_manager.py b/tests/plugins/test_manager.py index 095714b..8395c6e 100644 --- a/tests/plugins/test_manager.py +++ b/tests/plugins/test_manager.py @@ -42,7 +42,7 @@ class TestPluginManager(unittest.TestCase): @pytest.mark.xfail(reason="see https://github.com/Yakifo/aio-hbmqtt/issues/15", strict=False) def test_load_plugin(self): manager = PluginManager("hbmqtt.test.plugins", context=None) - self.assertTrue(len(manager._plugins) > 0) + assert len(manager._plugins) > 0 @pytest.mark.xfail(reason="see https://github.com/Yakifo/aio-hbmqtt/issues/15", strict=False) def test_fire_event(self): @@ -54,7 +54,7 @@ class TestPluginManager(unittest.TestCase): manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop) self.loop.run_until_complete(fire_event()) plugin = manager.get_plugin("event_plugin") - self.assertTrue(plugin.object.test_flag) + assert plugin.object.test_flag @pytest.mark.xfail(reason="see https://github.com/Yakifo/aio-hbmqtt/issues/15", strict=False) def test_fire_event_wait(self): @@ -65,7 +65,7 @@ class TestPluginManager(unittest.TestCase): manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop) self.loop.run_until_complete(fire_event()) plugin = manager.get_plugin("event_plugin") - self.assertTrue(plugin.object.test_flag) + assert plugin.object.test_flag @pytest.mark.xfail(reason="see https://github.com/Yakifo/aio-hbmqtt/issues/15", strict=False) def test_map_coro(self): @@ -75,7 +75,7 @@ class TestPluginManager(unittest.TestCase): manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop) self.loop.run_until_complete(call_coro()) plugin = manager.get_plugin("event_plugin") - self.assertTrue(plugin.object.test_coro) + assert plugin.object.test_coro @pytest.mark.xfail(reason="see https://github.com/Yakifo/aio-hbmqtt/issues/15", strict=False) def test_map_coro_return(self): @@ -98,4 +98,4 @@ class TestPluginManager(unittest.TestCase): manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop) ret = self.loop.run_until_complete(call_coro()) - self.assertTrue(len(ret) == 0) + assert len(ret) == 0 diff --git a/tests/plugins/test_persistence.py b/tests/plugins/test_persistence.py index a317f35..2bd69cc 100644 --- a/tests/plugins/test_persistence.py +++ b/tests/plugins/test_persistence.py @@ -54,5 +54,5 @@ class TestSQLitePlugin(unittest.TestCase): # conn = sqlite3.connect(dbfile) # cursor = conn.cursor() # row = cursor.execute("SELECT client_id FROM session where client_id = 'test_save_session'").fetchone() - # self.assertTrue(len(row) == 1) + # assert len(row) == 1 # self.assertEqual(row[0], s.client_id)