Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions modpoll/mqtt_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ def connect(self) -> bool:
}
if self.mqtt_version == "5.0":
connect_kwargs["clean_start"] = self.clean_start_or_session
else:
connect_kwargs["clean_session"] = self.clean_start_or_session

self.mqtt_client.connect(**connect_kwargs)
self.mqtt_client.loop_start()
Expand Down
33 changes: 33 additions & 0 deletions tests/test_mqtt_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,39 @@ def is_connected(self):
assert result is None


def test_connect_mqtt_v311_omits_clean_session_kwarg(monkeypatch):
"""paho-mqtt 2.x rejects clean_session in connect(); it is set on the Client constructor."""
handler = MqttHandler(
name="test_mqtt",
host="broker.local",
port=1883,
user=None,
password=None,
clientid="test_client",
qos=0,
mqtt_version="3.1.1",
)

assert handler.setup()

captured = {}

def fake_connect(**kwargs):
captured.update(kwargs)
return 0

monkeypatch.setattr(handler.mqtt_client, "connect", fake_connect)
monkeypatch.setattr(handler.mqtt_client, "loop_start", lambda: None)

assert handler.connect() is True
assert "clean_session" not in captured
assert captured == {
"host": "broker.local",
"port": 1883,
"keepalive": 60,
}


def test_publish_attempts_reconnect_when_disconnected_qos1(monkeypatch):
handler = MqttHandler(
name="test_mqtt",
Expand Down
Loading