Skip to content

Commit

Permalink
Rename tests as PICS=WHM
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterC1965
PeterC1965 committed Jul 30, 2024
1 parent d6318f6 commit 8bf5dca
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,6 @@ jobs:
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EEVSE_2_5.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EPM_2_1.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EPM_2_2.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EWATERHTRM_1_2.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_EWATERHTRM_2_1.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_FAN_3_1.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_FAN_3_2.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_FAN_3_3.py'
Expand Down Expand Up @@ -600,6 +598,9 @@ jobs:
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_RVCOPSTATE_2_4.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SC_7_1.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_SWTCH.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_WHM_1_2.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_WHM_2_1.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_LVL_2_3.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TCP_Tests.py'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestConformanceSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
Expand Down
12 changes: 6 additions & 6 deletions src/python_testing/TC_EWATERHTRM_1_2.py → src/python_testing/TC_WHM_1_2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,31 @@
from mobly import asserts


class TC_EWATERHTRM_1_2(MatterBaseTest):
class TC_WHM_1_2(MatterBaseTest):

async def read_mode_attribute_expect_success(self, endpoint, attribute):
cluster = Clusters.Objects.WaterHeaterMode
return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute)

def desc_TC_EWATERHTRM_1_2(self) -> str:
return "[TC-EWATERHTRM-1.2] Cluster attributes with DUT as Server"
def desc_TC_WHM_1_2(self) -> str:
return "[TC-WHM-1.2] Cluster attributes with DUT as Server"

def steps_TC_EWATERHTRM_1_2(self) -> list[TestStep]:
def steps_TC_WHM_1_2(self) -> list[TestStep]:
steps = [
TestStep(1, "Commissioning, already done", is_commissioning=True),
TestStep(2, "Read the SupportedModes attribute"),
TestStep(3, "Read the CurrentMode attribute"),
]
return steps

def pics_TC_EWATERHTRM_1_2(self) -> list[str]:
def pics_TC_WHM_1_2(self) -> list[str]:
pics = [
"WHM.S",
]
return pics

@async_test_body
async def test_TC_EWATERHTRM_1_2(self):
async def test_TC_WHM_1_2(self):

endpoint = self.user_params.get("endpoint", 1)

Expand Down
12 changes: 6 additions & 6 deletions src/python_testing/TC_EWATERHTRM_2_1.py → src/python_testing/TC_WHM_2_1.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
from mobly import asserts


class TC_EWATERHTRM_2_1(MatterBaseTest):
class TC_WHM_2_1(MatterBaseTest):

def __init__(self, *args):
super().__init__(*args)
self.endpoint = 0

def steps_TC_EWATERHTRM_2_1(self) -> list[TestStep]:
def steps_TC_WHM_2_1(self) -> list[TestStep]:
steps = [
TestStep(1, "Commissioning, already done", is_commissioning=True),
TestStep(2, "Read the SupportedModes attribute"),
Expand Down Expand Up @@ -70,11 +70,11 @@ async def send_change_to_mode_cmd(self, newMode) -> Clusters.Objects.WaterHeater
"Unexpected return type for Water Heater Mode ChangeToMode")
return ret

def pics_TC_EWATERHTRM_2_1(self) -> list[str]:
return ["EWATERHTRM.S"]
def pics_TC_WHM_2_1(self) -> list[str]:
return ["WHM.S"]

@async_test_body
async def test_TC_EWATERHTRM_2_1(self):
async def test_TC_WHM_2_1(self):

# Valid modes. Only ModeManual referred to in this test
# ModeOff = 0
Expand Down Expand Up @@ -114,7 +114,7 @@ async def test_TC_EWATERHTRM_2_1(self):
asserts.assert_equal(ret.status, Status.Success,
"Changing the mode to the current mode should be a no-op")

# Steps 5-9 are not performed as EWATERHTRM.S.M.CAN_TEST_MODE_FAILURE is false
# Steps 5-9 are not performed as WHM.S.M.CAN_TEST_MODE_FAILURE is false
self.step(5)
self.step(6)
self.step(7)
Expand Down

0 comments on commit 8bf5dca

Please sign in to comment.