Skip to content

Commit 69bf08f

Browse files
committed
Implement result asserts
1 parent ccfa4fe commit 69bf08f

File tree

1 file changed

+58
-29
lines changed

1 file changed

+58
-29
lines changed

tests/test_smile.py

Lines changed: 58 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -677,25 +677,27 @@ async def test_connect_legacy_anna(self):
677677
await self.device_test(smile, testdata)
678678
assert not self.notifications
679679

680-
await self.tinker_thermostat(
680+
result = await self.tinker_thermostat(
681681
smile,
682682
"c34c6864216446528e95d88985e714cc",
683683
good_schedules=[
684684
"Thermostat schedule",
685685
],
686686
)
687+
assert result
687688
await smile.close_connection()
688689
await self.disconnect(server, client)
689690

690691
server, smile, client = await self.connect_wrapper(raise_timeout=True)
691-
await self.tinker_thermostat(
692+
result = await self.tinker_thermostat(
692693
smile,
693694
"c34c6864216446528e95d88985e714cc",
694695
good_schedules=[
695696
"Thermostat schedule",
696697
],
697698
unhappy=True,
698699
)
700+
assert result
699701
await smile.close_connection()
700702
await self.disconnect(server, client)
701703

@@ -765,25 +767,27 @@ async def test_connect_legacy_anna_2(self):
765767
await self.device_test(smile, testdata)
766768
assert not self.notifications
767769

768-
await self.tinker_thermostat(
770+
result = await self.tinker_thermostat(
769771
smile,
770772
"c34c6864216446528e95d88985e714cc",
771773
good_schedules=[
772774
"Thermostat schedule",
773775
],
774776
)
777+
assert result
775778
await smile.close_connection()
776779
await self.disconnect(server, client)
777780

778781
server, smile, client = await self.connect_wrapper(raise_timeout=True)
779-
await self.tinker_thermostat(
782+
result = await self.tinker_thermostat(
780783
smile,
781784
"c34c6864216446528e95d88985e714cc",
782785
good_schedules=[
783786
"Thermostat schedule",
784787
],
785788
unhappy=True,
786789
)
790+
assert result
787791
await smile.close_connection()
788792
await self.disconnect(server, client)
789793

@@ -945,23 +949,25 @@ async def test_connect_anna_v4(self):
945949
await self.device_test(smile, testdata)
946950
assert not self.notifications
947951

948-
await self.tinker_thermostat(
952+
result = await self.tinker_thermostat(
949953
smile,
950954
"eb5309212bf5407bb143e5bfa3b18aee",
951955
schedule_on=False,
952956
good_schedules=["Standaard", "Thuiswerken"],
953957
)
958+
assert result
954959
await smile.close_connection()
955960
await self.disconnect(server, client)
956961

957962
server, smile, client = await self.connect_wrapper(raise_timeout=True)
958-
await self.tinker_thermostat(
963+
result = await self.tinker_thermostat(
959964
smile,
960965
"eb5309212bf5407bb143e5bfa3b18aee",
961966
schedule_on=False,
962967
good_schedules=["Standaard", "Thuiswerken"],
963968
unhappy=True,
964969
)
970+
assert result
965971
await smile.close_connection()
966972
await self.disconnect(server, client)
967973

@@ -1039,23 +1045,25 @@ async def test_connect_anna_v4_dhw(self):
10391045
await self.device_test(smile, testdata)
10401046
assert not self.notifications
10411047

1042-
await self.tinker_thermostat(
1048+
result = await self.tinker_thermostat(
10431049
smile,
10441050
"eb5309212bf5407bb143e5bfa3b18aee",
10451051
schedule_on=False,
10461052
good_schedules=["Standaard", "Thuiswerken"],
10471053
)
1054+
assert result
10481055
await smile.close_connection()
10491056
await self.disconnect(server, client)
10501057

10511058
server, smile, client = await self.connect_wrapper(raise_timeout=True)
1052-
await self.tinker_thermostat(
1059+
result = await self.tinker_thermostat(
10531060
smile,
10541061
"eb5309212bf5407bb143e5bfa3b18aee",
10551062
good_schedules=["Standaard", "Thuiswerken"],
10561063
schedule_on=False,
10571064
unhappy=True,
10581065
)
1066+
assert result
10591067
await smile.close_connection()
10601068
await self.disconnect(server, client)
10611069

@@ -1082,23 +1090,25 @@ async def test_connect_anna_v4_no_tag(self):
10821090

10831091
await self.device_test(smile, testdata)
10841092

1085-
await self.tinker_thermostat(
1093+
result = await self.tinker_thermostat(
10861094
smile,
10871095
"eb5309212bf5407bb143e5bfa3b18aee",
10881096
schedule_on=False,
10891097
good_schedules=["Standaard", "Thuiswerken"],
10901098
)
1099+
assert result
10911100
await smile.close_connection()
10921101
await self.disconnect(server, client)
10931102

10941103
server, smile, client = await self.connect_wrapper(raise_timeout=True)
1095-
await self.tinker_thermostat(
1104+
result = await self.tinker_thermostat(
10961105
smile,
10971106
"eb5309212bf5407bb143e5bfa3b18aee",
10981107
schedule_on=False,
10991108
good_schedules=["Standaard", "Thuiswerken"],
11001109
unhappy=True,
11011110
)
1111+
assert result
11021112
await smile.close_connection()
11031113
await self.disconnect(server, client)
11041114

@@ -1162,19 +1172,21 @@ async def test_connect_anna_without_boiler_fw3(self):
11621172
await self.device_test(smile, testdata)
11631173
assert not self.notifications
11641174

1165-
await self.tinker_thermostat(
1175+
result = await self.tinker_thermostat(
11661176
smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Test", "Normal"]
11671177
)
1178+
assert result
11681179
await smile.close_connection()
11691180
await self.disconnect(server, client)
11701181

11711182
server, smile, client = await self.connect_wrapper(raise_timeout=True)
1172-
await self.tinker_thermostat(
1183+
result = await self.tinker_thermostat(
11731184
smile,
11741185
"c34c6864216446528e95d88985e714cc",
11751186
good_schedules=["Test", "Normal"],
11761187
unhappy=True,
11771188
)
1189+
assert result
11781190
await smile.close_connection()
11791191
await self.disconnect(server, client)
11801192

@@ -1238,19 +1250,21 @@ async def test_connect_anna_without_boiler_fw4(self):
12381250
await self.device_test(smile, testdata)
12391251
assert not self.notifications
12401252

1241-
await self.tinker_thermostat(
1253+
result = await self.tinker_thermostat(
12421254
smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Test", "Normal"]
12431255
)
1256+
assert result
12441257
await smile.close_connection()
12451258
await self.disconnect(server, client)
12461259

12471260
server, smile, client = await self.connect_wrapper(raise_timeout=True)
1248-
await self.tinker_thermostat(
1261+
result = await self.tinker_thermostat(
12491262
smile,
12501263
"c34c6864216446528e95d88985e714cc",
12511264
good_schedules=["Test", "Normal"],
12521265
unhappy=True,
12531266
)
1267+
assert result
12541268
await smile.close_connection()
12551269
await self.disconnect(server, client)
12561270

@@ -1314,19 +1328,21 @@ async def test_connect_anna_without_boiler_fw42(self):
13141328
await self.device_test(smile, testdata)
13151329
assert not self.notifications
13161330

1317-
await self.tinker_thermostat(
1331+
result = await self.tinker_thermostat(
13181332
smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Normal"]
13191333
)
1334+
assert result
13201335
await smile.close_connection()
13211336
await self.disconnect(server, client)
13221337

13231338
server, smile, client = await self.connect_wrapper(raise_timeout=True)
1324-
await self.tinker_thermostat(
1339+
result = await self.tinker_thermostat(
13251340
smile,
13261341
"c34c6864216446528e95d88985e714cc",
13271342
good_schedules=["Normal"],
13281343
unhappy=True,
13291344
)
1345+
assert result
13301346
await smile.close_connection()
13311347
await self.disconnect(server, client)
13321348

@@ -1436,9 +1452,10 @@ async def test_connect_adam_plus_anna(self):
14361452
await self.device_test(smile, testdata)
14371453
assert not self.notifications
14381454

1439-
await self.tinker_thermostat(
1455+
result = await self.tinker_thermostat(
14401456
smile, "009490cc2f674ce6b576863fbb64f867", good_schedules=["Weekschema"]
14411457
)
1458+
assert result
14421459
switch_change = await self.tinker_switch(
14431460
smile, "aa6b0002df0a46e1b1eb94beb61eddfe"
14441461
)
@@ -1447,12 +1464,13 @@ async def test_connect_adam_plus_anna(self):
14471464
await self.disconnect(server, client)
14481465

14491466
server, smile, client = await self.connect_wrapper(raise_timeout=True)
1450-
await self.tinker_thermostat(
1467+
result = await self.tinker_thermostat(
14511468
smile,
14521469
"009490cc2f674ce6b576863fbb64f867",
14531470
good_schedules=["Weekschema"],
14541471
unhappy=True,
14551472
)
1473+
assert result
14561474
switch_change = await self.tinker_switch(
14571475
smile, "aa6b0002df0a46e1b1eb94beb61eddfe", unhappy=True
14581476
)
@@ -1658,11 +1676,12 @@ async def test_connect_adam_plus_anna_new(self):
16581676

16591677
await self.device_test(smile, testdata)
16601678

1661-
await self.tinker_thermostat(
1679+
result = await self.tinker_thermostat(
16621680
smile,
16631681
"f2bf9048bef64cc5b6d5110154e33c81",
16641682
good_schedules=["Weekschema", "Badkamer", "Test"],
16651683
)
1684+
assert result
16661685

16671686
switch_change = await self.tinker_switch(
16681687
smile,
@@ -2072,12 +2091,14 @@ async def test_connect_adam_zone_per_device(self):
20722091
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
20732092
await smile.delete_notification()
20742093

2075-
await self.tinker_thermostat(
2094+
result = await self.tinker_thermostat(
20762095
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=["GF7 Woonkamer"]
20772096
)
2078-
await self.tinker_thermostat(
2097+
assert result
2098+
result = await self.tinker_thermostat(
20792099
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=["CV Jessie"]
20802100
)
2101+
assert result
20812102
switch_change = await self.tinker_switch(
20822103
smile, "675416a629f343c495449970e2ca37b5"
20832104
)
@@ -2087,19 +2108,20 @@ async def test_connect_adam_zone_per_device(self):
20872108

20882109
server, smile, client = await self.connect_wrapper(raise_timeout=True)
20892110

2090-
await self.tinker_thermostat(
2111+
result = await self.tinker_thermostat(
20912112
smile,
20922113
"c50f167537524366a5af7aa3942feb1e",
20932114
good_schedules=["GF7 Woonkamer"],
20942115
unhappy=True,
20952116
)
2096-
2097-
await self.tinker_thermostat(
2117+
assert result
2118+
result = await self.tinker_thermostat(
20982119
smile,
20992120
"82fa13f017d240daa0d0ea1775420f24",
21002121
good_schedules=["CV Jessie"],
21012122
unhappy=True,
21022123
)
2124+
assert result
21032125

21042126
try:
21052127
await smile.delete_notification()
@@ -2491,12 +2513,14 @@ async def test_connect_adam_multiple_devices_per_zone(self):
24912513

24922514
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
24932515

2494-
await self.tinker_thermostat(
2516+
result = await self.tinker_thermostat(
24952517
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=["GF7 Woonkamer"]
24962518
)
2497-
await self.tinker_thermostat(
2519+
assert result
2520+
result = await self.tinker_thermostat(
24982521
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=["CV Jessie"]
24992522
)
2523+
assert result
25002524
switch_change = await self.tinker_switch(
25012525
smile, "675416a629f343c495449970e2ca37b5"
25022526
)
@@ -2505,18 +2529,22 @@ async def test_connect_adam_multiple_devices_per_zone(self):
25052529
await self.disconnect(server, client)
25062530

25072531
server, smile, client = await self.connect_wrapper(raise_timeout=True)
2508-
await self.tinker_thermostat(
2532+
result = await self.tinker_thermostat(
25092533
smile,
25102534
"c50f167537524366a5af7aa3942feb1e",
25112535
good_schedules=["GF7 Woonkamer"],
25122536
unhappy=True,
25132537
)
2514-
await self.tinker_thermostat(
2538+
assert result
2539+
2540+
result = await self.tinker_thermostat(
25152541
smile,
25162542
"82fa13f017d240daa0d0ea1775420f24",
25172543
good_schedules=["CV Jessie"],
25182544
unhappy=True,
25192545
)
2546+
assert result
2547+
25202548
await smile.close_connection()
25212549
await self.disconnect(server, client)
25222550

@@ -2736,12 +2764,13 @@ async def test_adam_plus_jip(self):
27362764

27372765
await self.device_test(smile, testdata)
27382766

2739-
await self.tinker_thermostat(
2767+
result = await self.tinker_thermostat(
27402768
smile,
27412769
"d58fec52899f4f1c92e4f8fad6d8c48c",
27422770
schedule_on=False,
27432771
good_schedules=[None],
27442772
)
2773+
assert result
27452774

27462775
await smile.close_connection()
27472776
await self.disconnect(server, client)

0 commit comments

Comments
 (0)