Skip to content

Commit

Permalink
Update name
Browse files Browse the repository at this point in the history
  • Loading branch information
@hare-siterwell
hare-siterwell committed Aug 24, 2023
1 parent e1bbbc3 commit 923ea3c
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 34 deletions.
7 changes: 0 additions & 7 deletions scripts/py_matter_yamltests/matter_yamltests/parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ def __init__(self, test: dict, config: dict, definitions: SpecDefinitions, pics_
self.busy_wait_ms = _value_or_none(test, 'busyWaitMs')
self.wait_for = _value_or_none(test, 'wait')
self.event_number = _value_or_none(test, 'eventNumber')
self.is_last_event_number = _value_or_none(test, 'isLastEventNumber')
self.run_if = _value_or_none(test, 'runIf')
self.save_response_as = _value_or_none(test, 'saveResponseAs')

Expand Down Expand Up @@ -579,8 +578,6 @@ def __init__(self, test: _TestStepWithPlaceholders, step_index: int, runtime_con
self._test.run_if)
self._test.event_number = self._config_variable_substitution(
self._test.event_number)
self._test.is_last_event_number = self._config_variable_substitution(
self._test.is_last_event_number)
self._test.cluster = self._config_variable_substitution(
self._test.cluster)
self._test.command = self._config_variable_substitution(
Expand Down Expand Up @@ -690,10 +687,6 @@ def event_number(self):
def event_number(self, value):
self._test.event_number = value

@property
def is_last_event_number(self):
return self._test.is_last_event_number

@property
def pics(self):
return self._test.pics
Expand Down
2 changes: 1 addition & 1 deletion scripts/py_matter_yamltests/matter_yamltests/runner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ async def _run(self, parser: TestParser, config: TestRunnerConfig):

test_duration = 0
for idx, request in enumerate(parser.tests):
if request.is_event and request.is_last_event_number:
if request.is_event and request.event_number == 'newEventsOnly':
request.event_number = self.last_event_number + 1

if not request.is_pics_enabled:
Expand Down
1 change: 0 additions & 1 deletion scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ def __check_test_step(self, config: dict, content):
'command': str,
'event': str,
'eventNumber': (int, str), # Can be a variable.
'isLastEventNumber': bool, # Can be a variable.
'disabled': bool,
'fabricFiltered': bool,
'verification': str,
Expand Down
6 changes: 3 additions & 3 deletions src/app/tests/suites/certification/Test_TC_SMOKECO_2_2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ tests:
PICS: SMOKECO.S.E00
command: "readEvent"
event: "SmokeAlarm"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: 1 }

Expand Down Expand Up @@ -203,7 +203,7 @@ tests:
PICS: SMOKECO.S.E00
command: "readEvent"
event: "SmokeAlarm"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: 2 }

Expand Down Expand Up @@ -248,6 +248,6 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}
6 changes: 3 additions & 3 deletions src/app/tests/suites/certification/Test_TC_SMOKECO_2_3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ tests:
PICS: SMOKECO.S.E01
command: "readEvent"
event: "COAlarm"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: 1 }

Expand Down Expand Up @@ -202,7 +202,7 @@ tests:
PICS: SMOKECO.S.E01
command: "readEvent"
event: "COAlarm"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: 2 }

Expand Down Expand Up @@ -247,6 +247,6 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}
22 changes: 11 additions & 11 deletions src/app/tests/suites/certification/Test_TC_SMOKECO_2_4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ tests:
PICS: SMOKECO.S.E02
command: "readEvent"
event: "LowBattery"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: 1 }

Expand Down Expand Up @@ -180,7 +180,7 @@ tests:
PICS: SMOKECO.S.E02
command: "readEvent"
event: "LowBattery"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: 2 }

Expand Down Expand Up @@ -225,7 +225,7 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -281,7 +281,7 @@ tests:
PICS: SMOKECO.S.E03
command: "readEvent"
event: "HardwareFault"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -327,7 +327,7 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -383,7 +383,7 @@ tests:
PICS: SMOKECO.S.E04
command: "readEvent"
event: "EndOfService"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -429,7 +429,7 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -501,7 +501,7 @@ tests:
PICS: SMOKECO.S.E05
command: "readEvent"
event: "SelfTestComplete"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand All @@ -518,7 +518,7 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -563,7 +563,7 @@ tests:
PICS: SMOKECO.S.E05
command: "readEvent"
event: "SelfTestComplete"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand All @@ -580,6 +580,6 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}
16 changes: 8 additions & 8 deletions src/app/tests/suites/certification/Test_TC_SMOKECO_2_5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ tests:
PICS: SMOKECO.S.A0008 && SMOKECO.S.E08
command: "readEvent"
event: "InterconnectSmokeAlarm"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: interconnectSmokeAlarmSeverityLevel }

Expand Down Expand Up @@ -217,7 +217,7 @@ tests:
PICS: SMOKECO.S.A0008 && SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -275,7 +275,7 @@ tests:
PICS: SMOKECO.S.A0009 && SMOKECO.S.E09
command: "readEvent"
event: "InterconnectCOAlarm"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: { AlarmSeverityLevel: interconnectCOAlarmSeverityLevel }

Expand Down Expand Up @@ -330,7 +330,7 @@ tests:
PICS: SMOKECO.S.E0a
command: "readEvent"
event: "AllClear"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -681,7 +681,7 @@ tests:
PICS: SMOKECO.S.A0004 && SMOKECO.S.F00 && SMOKECO.S.E06
command: "readEvent"
event: "AlarmMuted"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -718,7 +718,7 @@ tests:
PICS: SMOKECO.S.A0004 && SMOKECO.S.F00 && SMOKECO.S.E07
command: "readEvent"
event: "MuteEnded"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -893,7 +893,7 @@ tests:
PICS: SMOKECO.S.A0004 && SMOKECO.S.F01 && SMOKECO.S.E06
command: "readEvent"
event: "AlarmMuted"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down Expand Up @@ -930,7 +930,7 @@ tests:
PICS: SMOKECO.S.A0004 && SMOKECO.S.F01 && SMOKECO.S.E07
command: "readEvent"
event: "MuteEnded"
isLastEventNumber: true
eventNumber: "newEventsOnly"
response:
value: {}

Expand Down

0 comments on commit 923ea3c

Please sign in to comment.