Revert "fix: update tests for A01 QoS 1 and timestamp changes"

This reverts commit 613db33.

Author: NOisi-X

tests/devices/traits/a01/test_init.py

@@ -77,8 +77,7 @@ async def test_dyad_api_query_values(dyad_api: DyadApi, fake_channel: FakeChanne
     assert message.protocol == RoborockMessageProtocol.RPC_REQUEST
     assert message.version == b"A01"
     payload_data = json.loads(unpad(message.payload, AES.block_size))
-    assert payload_data["dps"] == {"10000": "[209, 201, 207, 214, 215, 227, 229, 230, 222, 224]"}
-    assert "t" in payload_data
+    assert payload_data == {"dps": {"10000": "[209, 201, 207, 214, 215, 227, 229, 230, 222, 224]"}}
 
 
 @pytest.mark.parametrize(
@@ -175,8 +174,7 @@ async def test_zeo_api_query_values(zeo_api: ZeoApi, fake_channel: FakeChannel):
     assert message.protocol == RoborockMessageProtocol.RPC_REQUEST
     assert message.version == b"A01"
     payload_data = json.loads(unpad(message.payload, AES.block_size))
-    assert payload_data["dps"] == {"10000": "[203, 207, 226, 227, 224, 218]"}
-    assert "t" in payload_data
+    assert payload_data == {"dps": {"10000": "[203, 207, 226, 227, 224, 218]"}}
 
 
 @pytest.mark.parametrize(
@@ -247,8 +245,7 @@ async def test_dyad_api_set_value(dyad_api: DyadApi, fake_channel: FakeChannel):
     # decode the payload to verify contents
     payload_data = json.loads(unpad(message.payload, AES.block_size))
     # A01 protocol expects values to be strings in the dps dict
-    assert payload_data["dps"] == {"209": 1}
-    assert "t" in payload_data
+    assert payload_data == {"dps": {"209": 1}}
 
 
 async def test_zeo_api_set_value(zeo_api: ZeoApi, fake_channel: FakeChannel):
@@ -264,5 +261,4 @@ async def test_zeo_api_set_value(zeo_api: ZeoApi, fake_channel: FakeChannel):
     # decode the payload to verify contents
     payload_data = json.loads(unpad(message.payload, AES.block_size))
     # A01 protocol expects values to be strings in the dps dict
-    assert payload_data["dps"] == {"204": "standard"}
-    assert "t" in payload_data
+    assert payload_data == {"dps": {"204": "standard"}}

tests/e2e/test_device_manager.py

@@ -226,8 +226,6 @@ async def test_v1_device(
     test_topic = TEST_TOPIC_FORMAT.format(duid="abc123")
     mqtt_responses: list[bytes] = [
         *MQTT_DEFAULT_RESPONSES,
-        # PUBACK for the QoS 1 publish (MID=2)
-        mqtt_packet.gen_puback(mid=2),
         # ACK the GET_NETWORK_INFO call. id is deterministic based on deterministic_message_fixtures
         mqtt_packet.gen_publish(
             test_topic, mid=2, payload=response_builder.build_v1_rpc(data={"id": 9090, "result": NETWORK_INFO})
@@ -337,8 +335,6 @@ async def test_l01_device(
     test_topic = TEST_TOPIC_FORMAT.format(duid="abc123")
     mqtt_responses: list[bytes] = [
         *MQTT_DEFAULT_RESPONSES,
-        # PUBACK for the QoS 1 publish (MID=2)
-        mqtt_packet.gen_puback(mid=2),
         # ACK the GET_NETWORK_INFO call. id is deterministic based on deterministic_message_fixtures
         mqtt_packet.gen_publish(
             test_topic, mid=2, payload=mqtt_response_builder.build_v1_rpc(data={"id": 9090, "result": NETWORK_INFO})
@@ -470,14 +466,10 @@ async def test_q7_device(
     test_topic = TEST_TOPIC_FORMAT.format(duid="device-id-q7")
     mqtt_responses: list[bytes] = [
         *MQTT_DEFAULT_RESPONSES,
-        # PUBACK for the QoS 1 query publish (MID=2)
-        mqtt_packet.gen_puback(mid=2),
         # ACK the Query status call sent below. id is deterministic based on deterministic_message_fixtures
         mqtt_packet.gen_publish(
             test_topic, mid=2, payload=response_builder.build_b01_q7_rpc({"status": 2}, msg_id=9090)
         ),
-        # PUBACK for the QoS 1 start clean publish (MID=3)
-        mqtt_packet.gen_puback(mid=3),
         # ACK the start clean call sent below. id is deterministic based on deterministic_message_fixtures
         mqtt_packet.gen_publish(test_topic, mid=2, payload=response_builder.build_b01_q7_rpc("ok", msg_id=9093)),
     ]
@@ -535,8 +527,6 @@ async def test_a01_device(
     test_topic = TEST_TOPIC_FORMAT.format(duid="zeo_duid")
     mqtt_responses: list[bytes] = [
         *MQTT_DEFAULT_RESPONSES,
-        # PUBACK for the QoS 1 publish (MID=2, matches the query publish below)
-        mqtt_packet.gen_puback(mid=2),
         # ACK the Query state call sent below. id is deterministic based on deterministic_message_fixtures
         mqtt_packet.gen_publish(test_topic, mid=2, payload=response_builder.build_a01_rpc({"203": 6})),
     ]