Skip to content

Commit c03e4d6

Browse files
bouwewbouwew
committed
Update relevant testcases
1 parent 396bb0a commit c03e4d6

File tree

1 file changed

+1
-54
lines changed

1 file changed

+1
-54
lines changed

‎tests/test_smile.py‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None, preset=False):
388388
extra = data[0]
389389
device_list = data[1]
390390

391-
if extra["is_thermostat_gateway"]:
391+
if extra["heater_id"]:
392392
self.cooling_present = extra["cooling_present"]
393393
self.notifications = extra["notifications"]
394394
self._write_json("all_data", data)
@@ -650,8 +650,6 @@ async def test_connect_legacy_anna(self):
650650
assert smile._smile_legacy
651651

652652
await self.device_test(smile, testdata)
653-
_LOGGER.info(" # Assert master thermostat")
654-
assert smile._is_thermostat
655653
assert not smile._multi_thermostats
656654
assert not self.notifications
657655

@@ -749,8 +747,6 @@ async def test_connect_legacy_anna_2(self):
749747
assert smile._smile_legacy
750748

751749
await self.device_test(smile, testdata)
752-
_LOGGER.info(" # Assert master thermostat")
753-
assert smile._is_thermostat
754750
assert not smile._multi_thermostats
755751
assert not self.notifications
756752

@@ -821,9 +817,6 @@ async def test_connect_smile_p1_v2(self):
821817
assert smile._smile_legacy
822818

823819
await self.device_test(smile, testdata)
824-
_LOGGER.info(" # Assert no master thermostat")
825-
# it's not a thermostat :)
826-
assert not smile._is_thermostat
827820
assert not self.notifications
828821

829822
await smile.close_connection()
@@ -859,9 +852,6 @@ async def test_connect_smile_p1_v2_2(self):
859852
assert smile._smile_legacy
860853

861854
await self.device_test(smile, testdata)
862-
_LOGGER.info(" # Assert no master thermostat")
863-
# it's not a thermostat :)
864-
assert not smile._is_thermostat
865855
assert not self.notifications
866856

867857
await smile.close_connection()
@@ -944,8 +934,6 @@ async def test_connect_anna_v4(self):
944934
assert not smile._smile_legacy
945935

946936
await self.device_test(smile, testdata)
947-
_LOGGER.info(" # Assert master thermostat")
948-
assert smile._is_thermostat
949937
assert not smile._multi_thermostats
950938
assert not self.notifications
951939

@@ -989,8 +977,6 @@ async def test_connect_anna_v4_no_tag(self):
989977
assert not smile._smile_legacy
990978

991979
await self.device_test(smile, testdata)
992-
_LOGGER.info(" # Assert master thermostat")
993-
assert smile._is_thermostat
994980
assert not smile._multi_thermostats
995981

996982
await self.tinker_thermostat(
@@ -1041,8 +1027,6 @@ async def test_connect_anna_without_boiler_fw3(self):
10411027
assert not smile._smile_legacy
10421028

10431029
await self.device_test(smile, testdata)
1044-
_LOGGER.info(" # Assert master thermostat")
1045-
assert smile._is_thermostat
10461030
assert not smile._multi_thermostats
10471031
assert not self.notifications
10481032

@@ -1090,8 +1074,6 @@ async def test_connect_anna_without_boiler_fw4(self):
10901074
assert not smile._smile_legacy
10911075

10921076
await self.device_test(smile, testdata)
1093-
_LOGGER.info(" # Assert master thermostat")
1094-
assert smile._is_thermostat
10951077
assert not smile._multi_thermostats
10961078
assert not self.notifications
10971079

@@ -1181,8 +1163,6 @@ async def test_connect_anna_without_boiler_fw42(self):
11811163
assert not smile._smile_legacy
11821164

11831165
await self.device_test(smile, testdata)
1184-
_LOGGER.info(" # Assert master thermostat")
1185-
assert smile._is_thermostat
11861166
assert not smile._multi_thermostats
11871167
assert not self.notifications
11881168

@@ -1246,8 +1226,6 @@ async def test_connect_adam_plus_anna(self):
12461226
assert not smile._smile_legacy
12471227

12481228
await self.device_test(smile, testdata)
1249-
_LOGGER.info(" # Assert master thermostat")
1250-
assert smile._is_thermostat
12511229
assert not smile._multi_thermostats
12521230
assert not self.notifications
12531231

@@ -1447,8 +1425,6 @@ async def test_connect_adam_plus_anna_new(self):
14471425
assert not smile._smile_legacy
14481426

14491427
await self.device_test(smile, testdata)
1450-
_LOGGER.info(" # Assert master thermostat")
1451-
assert smile._is_thermostat
14521428
assert smile._multi_thermostats
14531429

14541430
switch_change = await self.tinker_switch(
@@ -1593,8 +1569,6 @@ async def test_connect_adam_zone_per_device(self):
15931569
assert not smile._smile_legacy
15941570

15951571
await self.device_test(smile, testdata)
1596-
_LOGGER.info(" # Assert master thermostat")
1597-
assert smile._is_thermostat
15981572
assert smile._multi_thermostats
15991573

16001574
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
@@ -1999,8 +1973,6 @@ async def test_connect_adam_multiple_devices_per_zone(self):
19991973
assert not smile._smile_legacy
20001974

20011975
await self.device_test(smile, testdata)
2002-
_LOGGER.info(" # Assert master thermostat")
2003-
assert smile._is_thermostat
20041976
assert smile._multi_thermostats
20051977

20061978
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
@@ -2099,8 +2071,6 @@ async def test_connect_p1v3(self):
20992071
assert not smile._smile_legacy
21002072

21012073
await self.device_test(smile, testdata)
2102-
# it's not a thermostat :)
2103-
assert not smile._is_thermostat
21042074
assert not self.notifications
21052075

21062076
await smile.close_connection()
@@ -2134,9 +2104,6 @@ async def test_connect_p1v3solarfake(self):
21342104
assert not smile._smile_legacy
21352105

21362106
await self.device_test(smile, testdata)
2137-
_LOGGER.info(" # Assert nomaster thermostat")
2138-
# it's not a thermostat :)
2139-
assert not smile._is_thermostat
21402107
assert not self.notifications
21412108

21422109
await smile.close_connection()
@@ -2188,9 +2155,6 @@ async def test_connect_p1v3_full_option(self):
21882155
assert not smile._smile_legacy
21892156

21902157
await self.device_test(smile, testdata)
2191-
_LOGGER.info(" # Assert no master thermostat")
2192-
# it's not a thermostat :)
2193-
assert not smile._is_thermostat
21942158
assert not self.notifications
21952159

21962160
await smile.close_connection()
@@ -2244,8 +2208,6 @@ async def test_connect_anna_heatpump(self):
22442208

22452209
# Preset cooling_active to True, will turn to False due to the lowered outdoor temp
22462210
await self.device_test(smile, testdata, True)
2247-
_LOGGER.info(" # Assert master thermostat")
2248-
assert smile._is_thermostat
22492211
assert not smile._multi_thermostats
22502212
assert self.cooling_present
22512213
assert not self.notifications
@@ -2300,8 +2262,6 @@ async def test_connect_anna_heatpump_cooling(self):
23002262
assert not smile._smile_legacy
23012263

23022264
await self.device_test(smile, testdata)
2303-
_LOGGER.info(" # Assert master thermostat")
2304-
assert smile._is_thermostat
23052265
assert not smile._multi_thermostats
23062266
assert self.cooling_present
23072267
assert not self.notifications
@@ -2332,8 +2292,6 @@ async def test_connect_adam_plus_anna_copy_with_error_domain_added(self):
23322292
assert not smile._smile_legacy
23332293

23342294
await self.device_test(smile, testdata, True)
2335-
_LOGGER.info(" # Assert master thermostat")
2336-
assert smile._is_thermostat
23372295
assert not smile._multi_thermostats
23382296

23392297
assert "3d28a20e17cb47dca210a132463721d5" in self.notifications
@@ -2482,9 +2440,6 @@ async def test_connect_stretch_v31(self):
24822440
assert smile._smile_legacy
24832441

24842442
await self.device_test(smile, testdata)
2485-
_LOGGER.info(" # Assert no master thermostat")
2486-
# it's not a thermostat :)
2487-
assert not smile._is_thermostat
24882443

24892444
await smile.close_connection()
24902445
await self.disconnect(server, client)
@@ -2762,9 +2717,6 @@ async def test_connect_stretch_v23(self):
27622717
assert smile._smile_legacy
27632718

27642719
await self.device_test(smile, testdata)
2765-
_LOGGER.info(" # Assert no master thermostat")
2766-
# it's not a thermostat :)
2767-
assert not smile._is_thermostat
27682720

27692721
switch_change = await self.tinker_switch(
27702722
smile, "2587a7fcdd7e482dab03fda256076b4b"
@@ -2812,8 +2764,6 @@ async def test_connect_stretch_v27_no_domain(self):
28122764

28132765
await self.device_test(smile, testdata)
28142766
_LOGGER.info(" # Assert no master thermostat")
2815-
# it's not a thermostat :)
2816-
assert not smile._is_thermostat
28172767

28182768
switch_change = await self.tinker_switch(
28192769
smile, "8b8d14b242e24cd789743c828b9a2ea9"
@@ -2867,9 +2817,6 @@ async def test_connect_p1v4(self):
28672817
assert not smile._smile_legacy
28682818

28692819
await self.device_test(smile, testdata)
2870-
_LOGGER.info(" # Assert no master thermostat")
2871-
# it's not a thermostat :)
2872-
assert not smile._is_thermostat
28732820
assert not self.notifications
28742821

28752822
await smile.close_connection()

0 commit comments

Comments
 (0)