pytest-mqtt 0.6.2.dev0__tar.gz → 0.7.0__tar.gz

{pytest_mqtt-0.6.2.dev0/pytest_mqtt.egg-info → pytest_mqtt-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-mqtt
-Version: 0.6.2.dev0
+Version: 0.7.0
 Summary: pytest-mqtt supports testing systems based on MQTT
 Author-email: Andreas Motl <andreas.motl@panodata.org>, Richard Pobering <richard.pobering@panodata.org>
 Project-URL: changelog, https://github.com/mqtt-tools/pytest-mqtt/blob/main/CHANGES.rst
@@ -31,6 +31,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Communications
 Classifier: Topic :: Education
 Classifier: Topic :: Home Automation
@@ -61,8 +62,7 @@ Requires-Dist: build<2; extra == "release"
 Requires-Dist: twine<7; extra == "release"
 Provides-Extra: test
 Requires-Dist: coverage<8; extra == "test"
-Requires-Dist: pytest<9; extra == "test"
-Requires-Dist: pytest-fixture-order<1; extra == "test"
+Requires-Dist: pytest<10; extra == "test"
 Requires-Dist: pytest-httpserver<2; extra == "test"
 Requires-Dist: pytest-ordering<1; extra == "test"
 Dynamic: license-file
@@ -130,6 +130,10 @@ MQTT server host and port are configurable via pytest cli arguments:
 You may additionally specify a username and password for connecting to the broker with:
 ``--mqtt-username`` and ``--mqtt-password``. Default values are ``guest``/``guest``.
 
+By default, the test fixture subscribes to all topics, listening on ``#``. This can be
+disabled with the ``--no-subscribe-all`` option. You can then subscribe to the topics
+you are interested in within each test using ``capmqtt.mqtt_client.client.subscribe(cpe.info)``.
+
 ``mosquitto`` fixture
 =====================
 

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0}/README.rst

@@ -61,6 +61,10 @@ MQTT server host and port are configurable via pytest cli arguments:
 You may additionally specify a username and password for connecting to the broker with:
 ``--mqtt-username`` and ``--mqtt-password``. Default values are ``guest``/``guest``.
 
+By default, the test fixture subscribes to all topics, listening on ``#``. This can be
+disabled with the ``--no-subscribe-all`` option. You can then subscribe to the topics
+you are interested in within each test using ``capmqtt.mqtt_client.client.subscribe(cpe.info)``.
+
 ``mosquitto`` fixture
 =====================
 

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "pytest-mqtt"
-version = "0.6.2.dev0"
+version = "0.7.0"
 description = "pytest-mqtt supports testing systems based on MQTT"
 readme = "README.rst"
 keywords = [ "mosquitto", "mqtt", "paho", "pytest", "testing" ]
@@ -39,6 +39,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Communications",
   "Topic :: Education",
   "Topic :: Home Automation",
@@ -73,8 +74,7 @@ optional-dependencies.release = [
 ]
 optional-dependencies.test = [
   "coverage<8",
-  "pytest<9",
-  "pytest-fixture-order<1",
+  "pytest<10",
   "pytest-httpserver<2",
   "pytest-ordering<1",
 ]
@@ -100,7 +100,7 @@ line-length = 120
 [tool.pytest.ini_options]
 minversion = "2.0"
 addopts = """
-  -rfEX -p pytester --strict-markers --verbosity=3
+  -rfEXS -p pytester --strict-markers --verbosity=3
   """
 log_level = "DEBUG"
 log_cli_level = "DEBUG"

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0}/pytest_mqtt/capmqtt.py

@@ -35,6 +35,7 @@ class MqttClientAdapter(threading.Thread):
         port: int = 1883,
         username: str = "guest",
         password: str = "guest",
+        subscribe_all: bool = True,
     ):
         super().__init__()
         self.client: mqtt.Client
@@ -51,6 +52,7 @@ class MqttClientAdapter(threading.Thread):
         self.port = int(port)
         self.username = username
         self.password = password
+        self.subscribe_all = subscribe_all
 
         self.setup()
 
@@ -66,7 +68,8 @@ class MqttClientAdapter(threading.Thread):
 
         logger.debug("[PYTEST] Connecting to MQTT broker")
         client.connect(host=self.host, port=self.port)
-        client.subscribe("#")
+        if self.subscribe_all:
+            client.subscribe("#")
 
     def run(self) -> None:
         self.client.loop_start()
@@ -117,13 +120,19 @@ class MqttCaptureFixture:
         port: int = 1883,
         username: str = "guest",
         password: str = "guest",
+        subscribe_all: bool = True,
     ) -> None:
         """Creates a new funcarg."""
         self._buffer: t.List[MqttMessage] = []
         self._decode_utf8: bool = decode_utf8 or False
 
         self.mqtt_client = MqttClientAdapter(
-            on_message_callback=self.on_message, host=host, port=port, username=username, password=password
+            on_message_callback=self.on_message,
+            host=host,
+            port=port,
+            username=username,
+            password=password,
+            subscribe_all=subscribe_all,
         )
         self.mqtt_client.start()
         # time.sleep(0.1)
@@ -178,6 +187,7 @@ def capmqtt(request, mqtt_settings: MqttSettings):
 
     host, port = mqtt_settings.host, mqtt_settings.port
     username, password = mqtt_settings.username, mqtt_settings.password
+    subscribe_all = mqtt_settings.subscribe_all
 
     capmqtt_decode_utf8 = (
         getattr(request.config.option, "capmqtt_decode_utf8", False)
@@ -185,7 +195,12 @@ def capmqtt(request, mqtt_settings: MqttSettings):
         or request.node.get_closest_marker("capmqtt_decode_utf8") is not None
     )
     result = MqttCaptureFixture(
-        decode_utf8=capmqtt_decode_utf8, host=host, port=port, username=username, password=password
+        decode_utf8=capmqtt_decode_utf8,
+        host=host,
+        port=port,
+        username=username,
+        password=password,
+        subscribe_all=subscribe_all,
     )
     delay()
     yield result

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0}/pytest_mqtt/model.py

@@ -19,3 +19,4 @@ class MqttSettings:
     port: int
     username: str
     password: str
+    subscribe_all: bool

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0}/pytest_mqtt/mosquitto.py

@@ -86,6 +86,9 @@ def pytest_addoption(parser) -> None:
     parser.addoption("--mqtt-port", action="store", type=int, default=1883, help="MQTT port number")
     parser.addoption("--mqtt-username", action="store", type=str, default="guest", help="Username for connection")
     parser.addoption("--mqtt-password", action="store", type=str, default="guest", help="Password for connection")
+    parser.addoption(
+        "--no-subscribe-all", action="store_false", dest="subscribe_all", help="Do not subscribe to all topics"
+    )
 
 
 @pytest.fixture(scope="session")
@@ -95,6 +98,7 @@ def mqtt_settings(pytestconfig) -> MqttSettings:
         port=pytestconfig.getoption("--mqtt-port"),
         username=pytestconfig.getoption("--mqtt-username"),
         password=pytestconfig.getoption("--mqtt-password"),
+        subscribe_all=pytestconfig.getoption("subscribe_all"),
     )
 
 

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0/pytest_mqtt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-mqtt
-Version: 0.6.2.dev0
+Version: 0.7.0
 Summary: pytest-mqtt supports testing systems based on MQTT
 Author-email: Andreas Motl <andreas.motl@panodata.org>, Richard Pobering <richard.pobering@panodata.org>
 Project-URL: changelog, https://github.com/mqtt-tools/pytest-mqtt/blob/main/CHANGES.rst
@@ -31,6 +31,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Communications
 Classifier: Topic :: Education
 Classifier: Topic :: Home Automation
@@ -61,8 +62,7 @@ Requires-Dist: build<2; extra == "release"
 Requires-Dist: twine<7; extra == "release"
 Provides-Extra: test
 Requires-Dist: coverage<8; extra == "test"
-Requires-Dist: pytest<9; extra == "test"
-Requires-Dist: pytest-fixture-order<1; extra == "test"
+Requires-Dist: pytest<10; extra == "test"
 Requires-Dist: pytest-httpserver<2; extra == "test"
 Requires-Dist: pytest-ordering<1; extra == "test"
 Dynamic: license-file
@@ -130,6 +130,10 @@ MQTT server host and port are configurable via pytest cli arguments:
 You may additionally specify a username and password for connecting to the broker with:
 ``--mqtt-username`` and ``--mqtt-password``. Default values are ``guest``/``guest``.
 
+By default, the test fixture subscribes to all topics, listening on ``#``. This can be
+disabled with the ``--no-subscribe-all`` option. You can then subscribe to the topics
+you are interested in within each test using ``capmqtt.mqtt_client.client.subscribe(cpe.info)``.
+
 ``mosquitto`` fixture
 =====================
 

{pytest_mqtt-0.6.2.dev0 → pytest_mqtt-0.7.0}/pytest_mqtt.egg-info/requires.txt

@@ -20,7 +20,6 @@ twine<7
 
 [test]
 coverage<8
-pytest<9
-pytest-fixture-order<1
+pytest<10
 pytest-httpserver<2
 pytest-ordering<1