update imports in tests

tests/conftest.py

@@ -2,7 +2,7 @@ import unittest.mock
 
 import pytest
 
-import hbmqtt.broker
+import amqtt.broker
 
 test_config = {
     "listeners": {
@@ -17,7 +17,7 @@ test_config = {
 
 @pytest.fixture(scope="function")
 def mock_plugin_manager():
-    with unittest.mock.patch("hbmqtt.broker.PluginManager") as plugin_manager:
+    with unittest.mock.patch("amqtt.broker.PluginManager") as plugin_manager:
         yield plugin_manager
 
 
@@ -26,7 +26,7 @@ async def broker(mock_plugin_manager):
     # just making sure the mock is in place before we start our broker
     assert mock_plugin_manager is not None
 
-    broker = hbmqtt.broker.Broker(test_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = amqtt.broker.Broker(test_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     assert broker.transitions.is_started()
     assert broker._sessions == {}

tests/mqtt/protocol/test_handler.py

@@ -5,20 +5,20 @@ import unittest
 import asyncio
 import logging
 import random
-from hbmqtt.plugins.manager import PluginManager
-from hbmqtt.session import (
+from amqtt.plugins.manager import PluginManager
+from amqtt.session import (
     Session,
     OutgoingApplicationMessage,
     IncomingApplicationMessage,
 )
-from hbmqtt.mqtt.protocol.handler import ProtocolHandler
-from hbmqtt.adapters import StreamWriterAdapter, StreamReaderAdapter
-from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
-from hbmqtt.mqtt.publish import PublishPacket
-from hbmqtt.mqtt.puback import PubackPacket
-from hbmqtt.mqtt.pubrec import PubrecPacket
-from hbmqtt.mqtt.pubrel import PubrelPacket
-from hbmqtt.mqtt.pubcomp import PubcompPacket
+from amqtt.mqtt.protocol.handler import ProtocolHandler
+from amqtt.adapters import StreamWriterAdapter, StreamReaderAdapter
+from amqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
+from amqtt.mqtt.publish import PublishPacket
+from amqtt.mqtt.puback import PubackPacket
+from amqtt.mqtt.pubrec import PubrecPacket
+from amqtt.mqtt.pubrel import PubrelPacket
+from amqtt.mqtt.pubcomp import PubcompPacket
 
 formatter = (
     "[%(asctime)s] %(name)s {%(filename)s:%(lineno)d} %(levelname)s - %(message)s"
@@ -40,7 +40,7 @@ class ProtocolHandlerTest(unittest.TestCase):
         self.loop = asyncio.new_event_loop()
         asyncio.set_event_loop(self.loop)
         self.plugin_manager = PluginManager(
-            "hbmqtt.test.plugins", context=None, loop=self.loop
+            "amqtt.test.plugins", context=None, loop=self.loop
         )
 
     def tearDown(self):

tests/mqtt/test_connect.py

@@ -4,9 +4,9 @@
 import unittest
 import asyncio
 
-from hbmqtt.mqtt.connect import ConnectPacket, ConnectVariableHeader, ConnectPayload
-from hbmqtt.mqtt.packet import MQTTFixedHeader, CONNECT
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.connect import ConnectPacket, ConnectVariableHeader, ConnectPayload
+from amqtt.mqtt.packet import MQTTFixedHeader, CONNECT
+from amqtt.adapters import BufferReader
 
 
 class ConnectPacketTest(unittest.TestCase):

tests/mqtt/test_packet.py

@@ -4,9 +4,9 @@
 import unittest
 import asyncio
 
-from hbmqtt.mqtt.packet import CONNECT, MQTTFixedHeader
-from hbmqtt.errors import MQTTException
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.packet import CONNECT, MQTTFixedHeader
+from amqtt.errors import MQTTException
+from amqtt.adapters import BufferReader
 
 
 class TestMQTTFixedHeaderTest(unittest.TestCase):

tests/mqtt/test_puback.py

@@ -4,8 +4,8 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.puback import PubackPacket, PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.puback import PubackPacket, PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class PubackPacketTest(unittest.TestCase):

tests/mqtt/test_pubcomp.py

@@ -4,8 +4,8 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.pubcomp import PubcompPacket, PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.pubcomp import PubcompPacket, PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class PubcompPacketTest(unittest.TestCase):

tests/mqtt/test_publish.py

@@ -4,9 +4,9 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.publish import PublishPacket, PublishVariableHeader, PublishPayload
-from hbmqtt.adapters import BufferReader
-from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
+from amqtt.mqtt.publish import PublishPacket, PublishVariableHeader, PublishPayload
+from amqtt.adapters import BufferReader
+from amqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
 
 
 class PublishPacketTest(unittest.TestCase):

tests/mqtt/test_pubrec.py

@@ -4,8 +4,8 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.pubrec import PubrecPacket, PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.pubrec import PubrecPacket, PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class PubrecPacketTest(unittest.TestCase):

tests/mqtt/test_pubrel.py

@@ -4,8 +4,8 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.pubrel import PubrelPacket, PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.pubrel import PubrelPacket, PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class PubrelPacketTest(unittest.TestCase):

tests/mqtt/test_suback.py

@@ -4,9 +4,9 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.suback import SubackPacket, SubackPayload
-from hbmqtt.mqtt.packet import PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.suback import SubackPacket, SubackPayload
+from amqtt.mqtt.packet import PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class SubackPacketTest(unittest.TestCase):

tests/mqtt/test_subscribe.py

@@ -4,10 +4,10 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.subscribe import SubscribePacket, SubscribePayload
-from hbmqtt.mqtt.packet import PacketIdVariableHeader
-from hbmqtt.mqtt.constants import QOS_1, QOS_2
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.subscribe import SubscribePacket, SubscribePayload
+from amqtt.mqtt.packet import PacketIdVariableHeader
+from amqtt.mqtt.constants import QOS_1, QOS_2
+from amqtt.adapters import BufferReader
 
 
 class SubscribePacketTest(unittest.TestCase):

tests/mqtt/test_unsuback.py

@@ -4,9 +4,9 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.unsuback import UnsubackPacket
-from hbmqtt.mqtt.packet import PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.unsuback import UnsubackPacket
+from amqtt.mqtt.packet import PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class UnsubackPacketTest(unittest.TestCase):

tests/mqtt/test_unsubscribe.py

@@ -4,9 +4,9 @@
 import asyncio
 import unittest
 
-from hbmqtt.mqtt.unsubscribe import UnsubscribePacket, UnubscribePayload
-from hbmqtt.mqtt.packet import PacketIdVariableHeader
-from hbmqtt.adapters import BufferReader
+from amqtt.mqtt.unsubscribe import UnsubscribePacket, UnubscribePayload
+from amqtt.mqtt.packet import PacketIdVariableHeader
+from amqtt.adapters import BufferReader
 
 
 class UnsubscribePacketTest(unittest.TestCase):

tests/plugins/test_authentication.py

@@ -6,9 +6,9 @@ import unittest
 import logging
 import os
 import asyncio
-from hbmqtt.plugins.manager import BaseContext
-from hbmqtt.plugins.authentication import AnonymousAuthPlugin, FileAuthPlugin
-from hbmqtt.session import Session
+from amqtt.plugins.manager import BaseContext
+from amqtt.plugins.authentication import AnonymousAuthPlugin, FileAuthPlugin
+from amqtt.session import Session
 
 formatter = (
     "[%(asctime)s] %(name)s {%(filename)s:%(lineno)d} %(levelname)s - %(message)s"

tests/plugins/test_manager.py

@@ -5,7 +5,7 @@ import unittest
 import logging
 import asyncio
 
-from hbmqtt.plugins.manager import PluginManager
+from amqtt.plugins.manager import PluginManager
 
 formatter = (
     "[%(asctime)s] %(name)s {%(filename)s:%(lineno)d} %(levelname)s - %(message)s"
@@ -40,7 +40,7 @@ class TestPluginManager(unittest.TestCase):
         self.loop = asyncio.new_event_loop()
 
     def test_load_plugin(self):
-        manager = PluginManager("hbmqtt.test.plugins", context=None)
+        manager = PluginManager("amqtt.test.plugins", context=None)
         assert len(manager._plugins) > 0
 
     def test_fire_event(self):
@@ -49,7 +49,7 @@ class TestPluginManager(unittest.TestCase):
             await asyncio.sleep(1, loop=self.loop)
             await manager.close()
 
-        manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop)
+        manager = PluginManager("amqtt.test.plugins", context=None, loop=self.loop)
         self.loop.run_until_complete(fire_event())
         plugin = manager.get_plugin("event_plugin")
         assert plugin.object.test_flag
@@ -59,7 +59,7 @@ class TestPluginManager(unittest.TestCase):
             await manager.fire_event("test", wait=True)
             await manager.close()
 
-        manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop)
+        manager = PluginManager("amqtt.test.plugins", context=None, loop=self.loop)
         self.loop.run_until_complete(fire_event())
         plugin = manager.get_plugin("event_plugin")
         assert plugin.object.test_flag
@@ -68,7 +68,7 @@ class TestPluginManager(unittest.TestCase):
         async def call_coro():
             await manager.map_plugin_coro("test_coro")
 
-        manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop)
+        manager = PluginManager("amqtt.test.plugins", context=None, loop=self.loop)
         self.loop.run_until_complete(call_coro())
         plugin = manager.get_plugin("event_plugin")
         assert plugin.object.test_coro
@@ -77,7 +77,7 @@ class TestPluginManager(unittest.TestCase):
         async def call_coro():
             return await manager.map_plugin_coro("ret_coro")
 
-        manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop)
+        manager = PluginManager("amqtt.test.plugins", context=None, loop=self.loop)
         ret = self.loop.run_until_complete(call_coro())
         plugin = manager.get_plugin("event_plugin")
         self.assertEqual(ret[plugin], "TEST")
@@ -91,6 +91,6 @@ class TestPluginManager(unittest.TestCase):
         async def call_coro():
             return await manager.map_plugin_coro("ret_coro", filter_plugins=[])
 
-        manager = PluginManager("hbmqtt.test.plugins", context=None, loop=self.loop)
+        manager = PluginManager("amqtt.test.plugins", context=None, loop=self.loop)
         ret = self.loop.run_until_complete(call_coro())
         assert len(ret) == 0

tests/plugins/test_persistence.py

@@ -7,8 +7,8 @@ import logging
 import os
 import asyncio
 import sqlite3
-from hbmqtt.plugins.manager import BaseContext
-from hbmqtt.plugins.persistence import SQLitePlugin
+from amqtt.plugins.manager import BaseContext
+from amqtt.plugins.persistence import SQLitePlugin
 
 formatter = (
     "[%(asctime)s] %(name)s {%(filename)s:%(lineno)d} %(levelname)s - %(message)s"

tests/test_broker.py

@@ -7,8 +7,8 @@ from unittest.mock import call, MagicMock
 
 import pytest
 
-from hbmqtt.adapters import StreamReaderAdapter, StreamWriterAdapter
-from hbmqtt.broker import (
+from amqtt.adapters import StreamReaderAdapter, StreamWriterAdapter
+from amqtt.broker import (
     EVENT_BROKER_PRE_START,
     EVENT_BROKER_POST_START,
     EVENT_BROKER_PRE_SHUTDOWN,
@@ -19,8 +19,8 @@ from hbmqtt.broker import (
     EVENT_BROKER_CLIENT_UNSUBSCRIBED,
     EVENT_BROKER_MESSAGE_RECEIVED,
 )
-from hbmqtt.client import MQTTClient, ConnectException
-from hbmqtt.mqtt import (
+from amqtt.client import MQTTClient, ConnectException
+from amqtt.mqtt import (
     ConnectPacket,
     ConnackPacket,
     PublishPacket,
@@ -29,8 +29,8 @@ from hbmqtt.mqtt import (
     PubcompPacket,
     DisconnectPacket,
 )
-from hbmqtt.mqtt.connect import ConnectVariableHeader, ConnectPayload
-from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
+from amqtt.mqtt.connect import ConnectVariableHeader, ConnectPayload
+from amqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
 
 
 formatter = (
@@ -467,7 +467,7 @@ async def test_client_subscribe_publish_dollar_topic_2(broker):
 
 @pytest.mark.asyncio
 @pytest.mark.xfail(
-    reason="see https://github.com/Yakifo/aio-hbmqtt/issues/16", strict=False
+    reason="see https://github.com/Yakifo/aio-amqtt/issues/16", strict=False
 )
 async def test_client_publish_retain_subscribe(broker):
     sub_client = MQTTClient()

tests/test_client.py

@@ -10,9 +10,9 @@ import shutil
 
 import pytest
 
-from hbmqtt.client import MQTTClient, ConnectException
-from hbmqtt.broker import Broker
-from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
+from amqtt.client import MQTTClient, ConnectException
+from amqtt.broker import Broker
+from amqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
 
 formatter = (
     "[%(asctime)s] %(name)s {%(filename)s:%(lineno)d} %(levelname)s - %(message)s"
@@ -39,7 +39,7 @@ temp_dir: str = ""
 def setup_module():
     global ca_file, temp_dir
 
-    temp_dir = tempfile.mkdtemp(prefix="hbmqtt-test-")
+    temp_dir = tempfile.mkdtemp(prefix="amqtt-test-")
     url = "http://test.mosquitto.org/ssl/mosquitto.org.crt"
     ca_file = os.path.join(temp_dir, "mosquitto.org.crt")
     urllib.request.urlretrieve(url, ca_file)
@@ -76,7 +76,7 @@ async def test_connect_tcp_failure():
 
 @pytest.mark.asyncio
 async def test_connect_ws():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("ws://127.0.0.1:8080/")
@@ -87,7 +87,7 @@ async def test_connect_ws():
 
 @pytest.mark.asyncio
 async def test_reconnect_ws_retain_username_password():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("ws://fred:password@127.0.0.1:8080/")
@@ -102,7 +102,7 @@ async def test_reconnect_ws_retain_username_password():
 
 @pytest.mark.asyncio
 async def test_connect_ws_secure():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("ws://127.0.0.1:8081/", cafile=ca_file)
@@ -113,7 +113,7 @@ async def test_connect_ws_secure():
 
 @pytest.mark.asyncio
 async def test_ping():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("mqtt://127.0.0.1/")
@@ -125,7 +125,7 @@ async def test_ping():
 
 @pytest.mark.asyncio
 async def test_subscribe():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("mqtt://127.0.0.1/")
@@ -146,7 +146,7 @@ async def test_subscribe():
 
 @pytest.mark.asyncio
 async def test_unsubscribe():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("mqtt://127.0.0.1/")
@@ -165,7 +165,7 @@ async def test_unsubscribe():
 @pytest.mark.asyncio
 async def test_deliver():
     data = b"data"
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("mqtt://127.0.0.1/")
@@ -191,7 +191,7 @@ async def test_deliver():
 
 @pytest.mark.asyncio
 async def test_deliver_timeout():
-    broker = Broker(broker_config, plugin_namespace="hbmqtt.test.plugins")
+    broker = Broker(broker_config, plugin_namespace="amqtt.test.plugins")
     await broker.start()
     client = MQTTClient()
     await client.connect("mqtt://127.0.0.1/")

tests/test_codecs.py

@@ -4,7 +4,7 @@
 import unittest
 import asyncio
 
-from hbmqtt.codecs import (
+from amqtt.codecs import (
     bytes_to_hex_str,
     bytes_to_int,
     decode_string,