Skip to content

Commit cdac245

Browse files
bouwewbouwew
committed
Test_smile: replace schema by schedule
1 parent e5945a6 commit cdac245

File tree

1 file changed

+64
-62
lines changed

1 file changed

+64
-62
lines changed

‎tests/test_smile.py‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -523,24 +523,24 @@ async def tinker_thermostat_preset(self, smile, loc_id, unhappy=False):
523523
raise self.UnexpectedError
524524

525525
@pytest.mark.asyncio
526-
async def tinker_thermostat_schema(
527-
self, smile, loc_id, good_schemas=None, unhappy=False
526+
async def tinker_thermostat_schedule(
527+
self, smile, loc_id, good_schedules=None, unhappy=False
528528
):
529-
if good_schemas != []:
530-
good_schemas.append("!VeryBogusSchemaNameThatNobodyEverUsesOrShouldUse")
531-
for new_schema in good_schemas:
529+
if good_schedules != []:
530+
good_schedules.append("!VeryBogusScheduleNameThatNobodyEverUsesOrShouldUse")
531+
for new_schedule in good_schedules:
532532
assert_state = True
533533
warning = ""
534-
if new_schema[0] == "!":
534+
if new_schedule[0] == "!":
535535
assert_state = False
536536
warning = " Negative test"
537-
new_schema = new_schema[1:]
538-
_LOGGER.info("- Adjusting schedule to %s", f"{new_schema}{warning}")
537+
new_schedule = new_schedule[1:]
538+
_LOGGER.info("- Adjusting schedule to %s", f"{new_schedule}{warning}")
539539
try:
540-
schema_change = await smile.set_schedule_state(
541-
loc_id, new_schema, "on"
540+
schedule_change = await smile.set_schedule_state(
541+
loc_id, new_schedule, "on"
542542
)
543-
assert schema_change == assert_state
543+
assert schedule_change == assert_state
544544
_LOGGER.info(" + failed as intended")
545545
except (
546546
pw_exceptions.ErrorSendingCommandError,
@@ -552,17 +552,19 @@ async def tinker_thermostat_schema(
552552
_LOGGER.info(" - succeeded unexpectedly for some reason")
553553
raise self.UnexpectedError
554554
else: # pragma: no cover
555-
_LOGGER.info("- Skipping schema adjustments")
555+
_LOGGER.info("- Skipping schedule adjustments")
556556

557557
@pytest.mark.asyncio
558-
async def tinker_thermostat(self, smile, loc_id, good_schemas=None, unhappy=False):
558+
async def tinker_thermostat(
559+
self, smile, loc_id, good_schedules=None, unhappy=False
560+
):
559561
"""Toggle various climate settings to test functionality."""
560-
if good_schemas is None: # pragma: no cover
561-
good_schemas = ["Weekschema"]
562+
if good_schedules is None: # pragma: no cover
563+
good_schedules = ["Weekschedule"]
562564

563565
await self.tinker_thermostat_temp(smile, loc_id, unhappy)
564566
await self.tinker_thermostat_preset(smile, loc_id, unhappy)
565-
await self.tinker_thermostat_schema(smile, loc_id, good_schemas, unhappy)
567+
await self.tinker_thermostat_schedule(smile, loc_id, good_schedules, unhappy)
566568

567569
@staticmethod
568570
async def tinker_regulation_mode(smile):
@@ -669,7 +671,7 @@ async def test_connect_legacy_anna(self):
669671
await self.tinker_thermostat(
670672
smile,
671673
"c34c6864216446528e95d88985e714cc",
672-
good_schemas=[
674+
good_schedules=[
673675
"Thermostat schedule",
674676
],
675677
)
@@ -680,7 +682,7 @@ async def test_connect_legacy_anna(self):
680682
await self.tinker_thermostat(
681683
smile,
682684
"c34c6864216446528e95d88985e714cc",
683-
good_schemas=[
685+
good_schedules=[
684686
"Thermostat schedule",
685687
],
686688
unhappy=True,
@@ -764,7 +766,7 @@ async def test_connect_legacy_anna_2(self):
764766
await self.tinker_thermostat(
765767
smile,
766768
"c34c6864216446528e95d88985e714cc",
767-
good_schemas=[
769+
good_schedules=[
768770
"Thermostat schedule",
769771
],
770772
)
@@ -775,7 +777,7 @@ async def test_connect_legacy_anna_2(self):
775777
await self.tinker_thermostat(
776778
smile,
777779
"c34c6864216446528e95d88985e714cc",
778-
good_schemas=[
780+
good_schedules=[
779781
"Thermostat schedule",
780782
],
781783
unhappy=True,
@@ -949,7 +951,7 @@ async def test_connect_anna_v4(self):
949951
await self.tinker_thermostat(
950952
smile,
951953
"eb5309212bf5407bb143e5bfa3b18aee",
952-
good_schemas=["Standaard", "Thuiswerken"],
954+
good_schedules=["Standaard", "Thuiswerken"],
953955
)
954956
await smile.close_connection()
955957
await self.disconnect(server, client)
@@ -958,7 +960,7 @@ async def test_connect_anna_v4(self):
958960
await self.tinker_thermostat(
959961
smile,
960962
"eb5309212bf5407bb143e5bfa3b18aee",
961-
good_schemas=["Standaard", "Thuiswerken"],
963+
good_schedules=["Standaard", "Thuiswerken"],
962964
unhappy=True,
963965
)
964966
await smile.close_connection()
@@ -1045,7 +1047,7 @@ async def test_connect_anna_v4_dhw(self):
10451047
await self.tinker_thermostat(
10461048
smile,
10471049
"eb5309212bf5407bb143e5bfa3b18aee",
1048-
good_schemas=["Standaard", "Thuiswerken"],
1050+
good_schedules=["Standaard", "Thuiswerken"],
10491051
)
10501052
await smile.close_connection()
10511053
await self.disconnect(server, client)
@@ -1054,7 +1056,7 @@ async def test_connect_anna_v4_dhw(self):
10541056
await self.tinker_thermostat(
10551057
smile,
10561058
"eb5309212bf5407bb143e5bfa3b18aee",
1057-
good_schemas=["Standaard", "Thuiswerken"],
1059+
good_schedules=["Standaard", "Thuiswerken"],
10581060
unhappy=True,
10591061
)
10601062
await smile.close_connection()
@@ -1086,7 +1088,7 @@ async def test_connect_anna_v4_no_tag(self):
10861088
await self.tinker_thermostat(
10871089
smile,
10881090
"eb5309212bf5407bb143e5bfa3b18aee",
1089-
good_schemas=["Standaard", "Thuiswerken"],
1091+
good_schedules=["Standaard", "Thuiswerken"],
10901092
)
10911093
await smile.close_connection()
10921094
await self.disconnect(server, client)
@@ -1095,7 +1097,7 @@ async def test_connect_anna_v4_no_tag(self):
10951097
await self.tinker_thermostat(
10961098
smile,
10971099
"eb5309212bf5407bb143e5bfa3b18aee",
1098-
good_schemas=["Standaard", "Thuiswerken"],
1100+
good_schedules=["Standaard", "Thuiswerken"],
10991101
unhappy=True,
11001102
)
11011103
await smile.close_connection()
@@ -1134,7 +1136,7 @@ async def test_connect_anna_without_boiler_fw3(self):
11341136
assert not self.notifications
11351137

11361138
await self.tinker_thermostat(
1137-
smile, "c34c6864216446528e95d88985e714cc", good_schemas=["Test", "Normal"]
1139+
smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Test", "Normal"]
11381140
)
11391141
await smile.close_connection()
11401142
await self.disconnect(server, client)
@@ -1143,7 +1145,7 @@ async def test_connect_anna_without_boiler_fw3(self):
11431145
await self.tinker_thermostat(
11441146
smile,
11451147
"c34c6864216446528e95d88985e714cc",
1146-
good_schemas=["Test", "Normal"],
1148+
good_schedules=["Test", "Normal"],
11471149
unhappy=True,
11481150
)
11491151
await smile.close_connection()
@@ -1180,7 +1182,7 @@ async def test_connect_anna_without_boiler_fw4(self):
11801182
assert not self.notifications
11811183

11821184
await self.tinker_thermostat(
1183-
smile, "c34c6864216446528e95d88985e714cc", good_schemas=["Test", "Normal"]
1185+
smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Test", "Normal"]
11841186
)
11851187
await smile.close_connection()
11861188
await self.disconnect(server, client)
@@ -1189,7 +1191,7 @@ async def test_connect_anna_without_boiler_fw4(self):
11891191
await self.tinker_thermostat(
11901192
smile,
11911193
"c34c6864216446528e95d88985e714cc",
1192-
good_schemas=["Test", "Normal"],
1194+
good_schedules=["Test", "Normal"],
11931195
unhappy=True,
11941196
)
11951197
await smile.close_connection()
@@ -1267,7 +1269,7 @@ async def test_connect_anna_without_boiler_fw42(self):
12671269
assert not self.notifications
12681270

12691271
await self.tinker_thermostat(
1270-
smile, "c34c6864216446528e95d88985e714cc", good_schemas=["Normal"]
1272+
smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Normal"]
12711273
)
12721274
await smile.close_connection()
12731275
await self.disconnect(server, client)
@@ -1276,7 +1278,7 @@ async def test_connect_anna_without_boiler_fw42(self):
12761278
await self.tinker_thermostat(
12771279
smile,
12781280
"c34c6864216446528e95d88985e714cc",
1279-
good_schemas=["Normal"],
1281+
good_schedules=["Normal"],
12801282
unhappy=True,
12811283
)
12821284
await smile.close_connection()
@@ -1289,8 +1291,8 @@ async def test_connect_adam_plus_anna(self):
12891291
# Anna
12901292
"ee62cad889f94e8ca3d09021f03a660b": {
12911293
"sensors": {"setpoint": 20.5, "temperature": 20.5},
1292-
"selected_schedule": "Weekschema",
1293-
"last_used": "Weekschema",
1294+
"selected_schedule": "Weekschedule",
1295+
"last_used": "Weekschedule",
12941296
"active_preset": "home",
12951297
},
12961298
# Central
@@ -1329,7 +1331,7 @@ async def test_connect_adam_plus_anna(self):
13291331
assert not self.notifications
13301332

13311333
await self.tinker_thermostat(
1332-
smile, "009490cc2f674ce6b576863fbb64f867", good_schemas=["Weekschema"]
1334+
smile, "009490cc2f674ce6b576863fbb64f867", good_schedules=["Weekschedule"]
13331335
)
13341336
switch_change = await self.tinker_switch(
13351337
smile, "aa6b0002df0a46e1b1eb94beb61eddfe"
@@ -1342,7 +1344,7 @@ async def test_connect_adam_plus_anna(self):
13421344
await self.tinker_thermostat(
13431345
smile,
13441346
"009490cc2f674ce6b576863fbb64f867",
1345-
good_schemas=["Weekschema"],
1347+
good_schedules=["Weekschedule"],
13461348
unhappy=True,
13471349
)
13481350
switch_change = await self.tinker_switch(
@@ -1373,10 +1375,10 @@ async def test_connect_adam_plus_anna_new(self):
13731375
"vacation": [15.0, 28.0],
13741376
"no_frost": [10.0, 30.0],
13751377
},
1376-
"available_schedules": ["Weekschema", "Badkamer", "Test"],
1377-
"selected_schedule": "Weekschema",
1378+
"available_schedules": ["Weekschedule", "Badkamer", "Test"],
1379+
"selected_schedule": "Weekschedule",
13781380
"schedule_temperature": 18.5,
1379-
"last_used": "Weekschema",
1381+
"last_used": "Weekschedule",
13801382
"mode": "auto",
13811383
"control_state": "heating",
13821384
"sensors": {"temperature": 18.1, "setpoint": 18.5},
@@ -1457,7 +1459,7 @@ async def test_connect_adam_plus_anna_new(self):
14571459
"vacation": [15.0, 28.0],
14581460
"no_frost": [10.0, 30.0],
14591461
},
1460-
"available_schedules": ["Weekschema", "Badkamer", "Test"],
1462+
"available_schedules": ["Weekschedule", "Badkamer", "Test"],
14611463
"selected_schedule": "Badkamer",
14621464
"schedule_temperature": 16.0,
14631465
"last_used": "Badkamer",
@@ -1621,10 +1623,10 @@ async def test_connect_adam_zone_per_device(self):
16211623
await smile.delete_notification()
16221624

16231625
await self.tinker_thermostat(
1624-
smile, "c50f167537524366a5af7aa3942feb1e", good_schemas=["GF7 Woonkamer"]
1626+
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=["GF7 Woonkamer"]
16251627
)
16261628
await self.tinker_thermostat(
1627-
smile, "82fa13f017d240daa0d0ea1775420f24", good_schemas=["CV Jessie"]
1629+
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=["CV Jessie"]
16281630
)
16291631
switch_change = await self.tinker_switch(
16301632
smile, "675416a629f343c495449970e2ca37b5"
@@ -1638,14 +1640,14 @@ async def test_connect_adam_zone_per_device(self):
16381640
await self.tinker_thermostat(
16391641
smile,
16401642
"c50f167537524366a5af7aa3942feb1e",
1641-
good_schemas=["GF7 Woonkamer"],
1643+
good_schedules=["GF7 Woonkamer"],
16421644
unhappy=True,
16431645
)
16441646

16451647
await self.tinker_thermostat(
16461648
smile,
16471649
"82fa13f017d240daa0d0ea1775420f24",
1648-
good_schemas=["CV Jessie"],
1650+
good_schedules=["CV Jessie"],
16491651
unhappy=True,
16501652
)
16511653

@@ -1680,14 +1682,14 @@ async def test_connect_adam_multiple_devices_per_zone(self):
16801682
},
16811683
"available_schedules": [
16821684
"CV Roan",
1683-
"Bios Schema met Film Avond",
1685+
"Bios Schedule met Film Avond",
16841686
"GF7 Woonkamer",
1685-
"Badkamer Schema",
1687+
"Badkamer Schedule",
16861688
"CV Jessie",
16871689
],
16881690
"selected_schedule": "None",
16891691
"schedule_temperature": 15.0,
1690-
"last_used": "Badkamer Schema",
1692+
"last_used": "Badkamer Schedule",
16911693
"mode": "heat",
16921694
"sensors": {"temperature": 16.5, "setpoint": 13.0, "battery": 67},
16931695
},
@@ -1739,9 +1741,9 @@ async def test_connect_adam_multiple_devices_per_zone(self):
17391741
},
17401742
"available_schedules": [
17411743
"CV Roan",
1742-
"Bios Schema met Film Avond",
1744+
"Bios Schedule met Film Avond",
17431745
"GF7 Woonkamer",
1744-
"Badkamer Schema",
1746+
"Badkamer Schedule",
17451747
"CV Jessie",
17461748
],
17471749
"selected_schedule": "GF7 Woonkamer",
@@ -1898,9 +1900,9 @@ async def test_connect_adam_multiple_devices_per_zone(self):
18981900
},
18991901
"available_schedules": [
19001902
"CV Roan",
1901-
"Bios Schema met Film Avond",
1903+
"Bios Schedule met Film Avond",
19021904
"GF7 Woonkamer",
1903-
"Badkamer Schema",
1905+
"Badkamer Schedule",
19041906
"CV Jessie",
19051907
],
19061908
"selected_schedule": "CV Jessie",
@@ -1942,14 +1944,14 @@ async def test_connect_adam_multiple_devices_per_zone(self):
19421944
},
19431945
"available_schedules": [
19441946
"CV Roan",
1945-
"Bios Schema met Film Avond",
1947+
"Bios Schedule met Film Avond",
19461948
"GF7 Woonkamer",
1947-
"Badkamer Schema",
1949+
"Badkamer Schedule",
19481950
"CV Jessie",
19491951
],
1950-
"selected_schedule": "Badkamer Schema",
1952+
"selected_schedule": "Badkamer Schedule",
19511953
"schedule_temperature": 20.0,
1952-
"last_used": "Badkamer Schema",
1954+
"last_used": "Badkamer Schedule",
19531955
"mode": "auto",
19541956
"sensors": {"temperature": 18.9, "setpoint": 14.0, "battery": 92},
19551957
},
@@ -1986,14 +1988,14 @@ async def test_connect_adam_multiple_devices_per_zone(self):
19861988
},
19871989
"available_schedules": [
19881990
"CV Roan",
1989-
"Bios Schema met Film Avond",
1991+
"Bios Schedule met Film Avond",
19901992
"GF7 Woonkamer",
1991-
"Badkamer Schema",
1993+
"Badkamer Schedule",
19921994
"CV Jessie",
19931995
],
19941996
"selected_schedule": "None",
19951997
"schedule_temperature": 15.0,
1996-
"last_used": "Badkamer Schema",
1998+
"last_used": "Badkamer Schedule",
19971999
"mode": "heat",
19982000
"sensors": {
19992001
"temperature": 15.6,
@@ -2022,10 +2024,10 @@ async def test_connect_adam_multiple_devices_per_zone(self):
20222024
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
20232025

20242026
await self.tinker_thermostat(
2025-
smile, "c50f167537524366a5af7aa3942feb1e", good_schemas=["GF7 Woonkamer"]
2027+
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=["GF7 Woonkamer"]
20262028
)
20272029
await self.tinker_thermostat(
2028-
smile, "82fa13f017d240daa0d0ea1775420f24", good_schemas=["CV Jessie"]
2030+
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=["CV Jessie"]
20292031
)
20302032
switch_change = await self.tinker_switch(
20312033
smile, "675416a629f343c495449970e2ca37b5"
@@ -2038,13 +2040,13 @@ async def test_connect_adam_multiple_devices_per_zone(self):
20382040
await self.tinker_thermostat(
20392041
smile,
20402042
"c50f167537524366a5af7aa3942feb1e",
2041-
good_schemas=["GF7 Woonkamer"],
2043+
good_schedules=["GF7 Woonkamer"],
20422044
unhappy=True,
20432045
)
20442046
await self.tinker_thermostat(
20452047
smile,
20462048
"82fa13f017d240daa0d0ea1775420f24",
2047-
good_schemas=["CV Jessie"],
2049+
good_schedules=["CV Jessie"],
20482050
unhappy=True,
20492051
)
20502052
await smile.close_connection()

0 commit comments

Comments
 (0)