Assert switch_change at each test

To be able to assert a not switch_change

Author: bouwew

tests/test_smile.py

@@ -419,8 +419,6 @@ async def tinker_switch(
                 switch_change = await smile.set_switch_state(
                     dev_id, members, model, new_state
                 )
-                assert switch_change
-                _LOGGER.info("  + worked as intended")
             except (
                 pw_exceptions.ErrorSendingCommandError,
                 pw_exceptions.ResponseError,
@@ -430,6 +428,7 @@ async def tinker_switch(
                 else:  # pragma: no cover
                     _LOGGER.info("  - failed unexpectedly")
                     raise self.UnexpectedError
+        return switch_change
 
     @pytest.mark.asyncio
     async def tinker_thermostat(self, smile, loc_id, good_schemas=None, unhappy=False):
@@ -968,7 +967,8 @@ async def test_connect_adam_plus_anna(self):
         await self.tinker_thermostat(
             smile, "009490cc2f674ce6b576863fbb64f867", good_schemas=["Weekschema"]
         )
-        await self.tinker_switch(smile, "aa6b0002df0a46e1b1eb94beb61eddfe")
+        switch_change = await self.tinker_switch(smile, "aa6b0002df0a46e1b1eb94beb61eddfe")
+        assert switch_change
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -979,9 +979,10 @@ async def test_connect_adam_plus_anna(self):
             good_schemas=["Weekschema"],
             unhappy=True,
         )
-        await self.tinker_switch(
+        switch_change = await self.tinker_switch(
             smile, "aa6b0002df0a46e1b1eb94beb61eddfe", unhappy=True
         )
+        assert switch_change
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -1010,18 +1011,22 @@ async def test_connect_adam_plus_anna_new(self):
         await self.device_test(smile, testdata)
         assert smile.active_device_present
 
-        await self.tinker_switch(
+        switch_change = await self.tinker_switch(
             smile,
             "b83f9f9758064c0fab4af6578cba4c6d",
             ["aa6b0002df0a46e1b1eb94beb61eddfe", "f2be121e4a9345ac83c6e99ed89a98be"],
         )
-        await self.tinker_switch(
+        assert switch_change
+        switch_change = await self.tinker_switch(
             smile, "2743216f626f43948deec1f7ab3b3d70", model="dhw_cm_switch"
         )
-        await self.tinker_switch(
+        assert switch_change
+        switch_change = await self.tinker_switch(
             smile, "40ec6ebe67844b21914c4a5382a3f09f", model="lock"
         )
-        await self.tinker_switch(smile, "f2be121e4a9345ac83c6e99ed89a98be" )
+        assert switch_change
+        switch_change = await self.tinker_switch(smile, "f2be121e4a9345ac83c6e99ed89a98be" )
+        assert not switch_change
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -1091,7 +1096,8 @@ async def test_connect_adam_zone_per_device(self):
         await self.tinker_thermostat(
             smile, "82fa13f017d240daa0d0ea1775420f24", good_schemas=["CV Jessie"]
         )
-        await self.tinker_switch(smile, "675416a629f343c495449970e2ca37b5")
+        switch_change = await self.tinker_switch(smile, "675416a629f343c495449970e2ca37b5")
+        assert switch_change
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -1185,7 +1191,8 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         await self.tinker_thermostat(
             smile, "82fa13f017d240daa0d0ea1775420f24", good_schemas=["CV Jessie"]
         )
-        await self.tinker_switch(smile, "675416a629f343c495449970e2ca37b5")
+        switch_change = await self.tinker_switch(smile, "675416a629f343c495449970e2ca37b5")
+        assert switch_change
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -1486,12 +1493,14 @@ async def test_connect_stretch_v23(self):
         _LOGGER.info(" # Assert no master thermostat")
         assert smile.single_master_thermostat() is None  # it's not a thermostat :)
 
-        await self.tinker_switch(smile, "2587a7fcdd7e482dab03fda256076b4b")
-        await self.tinker_switch(
+        switch_change = await self.tinker_switch(smile, "2587a7fcdd7e482dab03fda256076b4b")
+        assert switch_change
+        switch_change = await self.tinker_switch(
             smile,
             "f7b145c8492f4dd7a4de760456fdef3e",
             ["407aa1c1099d463c9137a3a9eda787fd"],
         )
+        assert switch_change
 
         smile.get_all_devices()
         await self.device_test(smile, testdata)