Added some sanity checks to tests #1714

dsmr_mqtt/tests/services/test_broker.py

@@ -169,7 +169,10 @@ def test_run_cleanup(self, publish_mock, loop_mock):
         self.assertEqual(publish_mock.call_count, MAX)
 
         # We assert that the LAST X messages were sent, rest is deleted.
-        for x in range(MAX + 1, MAX * 2 + 1):
+        LOWEST_PAYLOAD = MAX + 1
+        HIGHEST_PAYLOAD = MAX * 2
+
+        for x in range(LOWEST_PAYLOAD, HIGHEST_PAYLOAD + 1):
             publish_mock.assert_any_call(topic="z", payload=str(x), qos=2, retain=True)
 
         self.assertFalse(queue.Message.objects.exists())
@@ -179,9 +182,13 @@ def test_run_cleanup(self, publish_mock, loop_mock):
 
         for current_call in publish_mock.call_args_list:
             current_call_payload = int(current_call[1]["payload"])
-            self.assertGreater(
-                current_call_payload, previous_payload
-            )  # Possible issues with queue order
+
+            # For our sanity and to ensure the right ones are deleted.
+            self.assertGreaterEqual(current_call_payload, LOWEST_PAYLOAD)
+            self.assertLessEqual(current_call_payload, HIGHEST_PAYLOAD)
+
+            # Fails? Possible issues with queue order.
+            self.assertGreater(current_call_payload, previous_payload)
             previous_payload = current_call_payload
 
     @mock.patch("paho.mqtt.client.Client.publish")