Merge branch 'master' into add-water-heater-management-test-scripts

PeterC1965 · web-flow · commit 5749641711d9 · 2024-07-28T09:49:47.000+01:00
diff --git a/examples/energy-management-app/energy-management-common/src/FakeReadings.cpp b/examples/energy-management-app/energy-management-common/src/FakeReadings.cpp
@@ -93,6 +93,12 @@ void FakeReadings::StartFakeReadings(EndpointId aEndpointId, int64_t aPower_mW,
 
     if (bReset)
     {
+        // Use a fixed random seed to try to avoid random CI test failures
+        // which are caused when the test is checking for 2 different numbers.
+        // This is statistically more likely when the test runs for a long time
+        // or if the seed is not set
+        srand(1);
+
         mTotalEnergyImported = 0;
         mTotalEnergyExported = 0;
     }
diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -8,13 +8,13 @@
                 "mac-amd64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2024.07.10-nightly.1"]
+            "tags": ["version:2@v2024.07.26-nightly.1"]
         },
         {
             "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
             "path": "fuchsia/third_party/zap/mac-amd64",
             "platforms": ["mac-arm64"],
-            "tags": ["version:2@v2024.07.10-nightly.1"]
+            "tags": ["version:2@v2024.07.26-nightly.1"]
         }
     ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
@@ -1 +1 @@
-v2024.07.10-nightly
+v2024.07.26-nightly
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2024.7.10'
+MIN_ZAP_VERSION = '2024.7.26'
 
 
 class ZapTool:
diff --git a/src/python_testing/TC_EEM_2_2.py b/src/python_testing/TC_EEM_2_2.py
@@ -53,7 +53,7 @@ def steps_TC_EEM_2_2(self) -> list[TestStep]:
             TestStep("4", "Wait 3 seconds"),
             TestStep("4a", "TH reads from the DUT the CumulativeEnergyImported attribute",
                      "Verify the read is successful and note the value read."),
-            TestStep("5", "Wait 5 seconds"),
+            TestStep("5", "Wait 3 seconds"),
             TestStep("5a", "TH reads from the DUT the CumulativeEnergyImported attribute",
                      "Verify the read is successful and that the value is greater than the value measured in step 4a."),
             TestStep("6", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.EEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.EEM.TEST_EVENT_TRIGGER for Stop Fake Readings Test Event."),
@@ -80,7 +80,7 @@ async def test_TC_EEM_2_2(self):
         cumulative_energy_imported = await self.read_eem_attribute_expect_success("CumulativeEnergyImported")
 
         self.step("5")
-        time.sleep(5)
+        time.sleep(3)
 
         self.step("5a")
         cumulative_energy_imported_2 = await self.read_eem_attribute_expect_success("CumulativeEnergyImported")
diff --git a/src/python_testing/TC_EEM_2_3.py b/src/python_testing/TC_EEM_2_3.py
@@ -53,7 +53,7 @@ def steps_TC_EEM_2_3(self) -> list[TestStep]:
             TestStep("4", "Wait 6 seconds"),
             TestStep("4a", "TH reads from the DUT the CumulativeEnergyExported attribute",
                      "Verify the read is successful and note the value read."),
-            TestStep("5", "Wait 11 seconds"),
+            TestStep("5", "Wait 6 seconds"),
             TestStep("5a", "TH reads from the DUT the CumulativeEnergyExported attribute",
                      "Verify the read is successful and that the value is greater than the value measured in step 4a."),
             TestStep("6", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.EEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.EEM.TEST_EVENT_TRIGGER for Stop Fake Readings Test Event."),
@@ -80,7 +80,7 @@ async def test_TC_EEM_2_3(self):
         cumulative_energy_exported = await self.read_eem_attribute_expect_success("CumulativeEnergyExported")
 
         self.step("5")
-        time.sleep(11)
+        time.sleep(6)
 
         self.step("5a")
         cumulative_energy_exported_2 = await self.read_eem_attribute_expect_success("CumulativeEnergyExported")
diff --git a/src/python_testing/TC_EEM_2_4.py b/src/python_testing/TC_EEM_2_4.py
@@ -53,7 +53,7 @@ def steps_TC_EEM_2_4(self) -> list[TestStep]:
             TestStep("4", "Wait 3 seconds"),
             TestStep("4a", "TH reads from the DUT the PeriodicEnergyImported attribute",
                      "Verify the read is successful and note the value read."),
-            TestStep("5", "Wait 5 seconds"),
+            TestStep("5", "Wait 3 seconds"),
             TestStep("5a", "TH reads from the DUT the PeriodicEnergyImported attribute",
                      "Verify the read is successful and that the value read has to be different from value measure in step 4a."),
             TestStep("6", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.EEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.EEM.TEST_EVENT_TRIGGER for Stop Fake Readings Test Event."),
@@ -80,7 +80,7 @@ async def test_TC_EEM_2_4(self):
         periodic_energy_imported = await self.read_eem_attribute_expect_success("PeriodicEnergyImported")
 
         self.step("5")
-        time.sleep(5)
+        time.sleep(3)
 
         self.step("5a")
         periodic_energy_imported_2 = await self.read_eem_attribute_expect_success("PeriodicEnergyImported")
diff --git a/src/python_testing/TC_EEM_2_5.py b/src/python_testing/TC_EEM_2_5.py
@@ -53,7 +53,7 @@ def steps_TC_EEM_2_5(self) -> list[TestStep]:
             TestStep("4", "Wait 6 seconds"),
             TestStep("4a", "TH reads from the DUT the PeriodicEnergyExported attribute",
                      "Verify the read is successful and note the value read."),
-            TestStep("5", "Wait 11 seconds"),
+            TestStep("5", "Wait 6 seconds"),
             TestStep("5a", "TH reads from the DUT the PeriodicEnergyExported attribute",
                      "Verify the read is successful and that the value read has to be different from value measure in step 4a."),
             TestStep("6", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.EEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.EEM.TEST_EVENT_TRIGGER for Stop Fake Readings Test Event."),
@@ -80,7 +80,7 @@ async def test_TC_EEM_2_5(self):
         periodic_energy_exported = await self.read_eem_attribute_expect_success("PeriodicEnergyExported")
 
         self.step("5")
-        time.sleep(11)
+        time.sleep(6)
 
         self.step("5a")
         periodic_energy_exported_2 = await self.read_eem_attribute_expect_success("PeriodicEnergyExported")
diff --git a/src/python_testing/TC_EPM_2_2.py b/src/python_testing/TC_EPM_2_2.py
@@ -61,7 +61,7 @@ def steps_TC_EPM_2_2(self) -> list[TestStep]:
                      "Verify the read is successful and that the value is between 3'848 and 4'848 mA. Note the value read."),
             TestStep("4c", "TH reads from the DUT the Voltage attribute",
                      "Verify the read is successful and that the value is between 229'000 and 231'000 mV. Note the value read."),
-            TestStep("5", "Wait 5 seconds"),
+            TestStep("5", "Wait 3 seconds"),
             TestStep("5a", "TH reads from the DUT the ActivePower attribute",
                      "Verify the read is successful, that the value is between '980'000 and 1'020'000 mW, and the value is different from the value read in step 4a."),
             TestStep("5b", "TH reads from the DUT the ActiveCurrent attribute",
@@ -105,8 +105,8 @@ async def test_TC_EPM_2_2(self):
             voltage = await self.check_epm_attribute_in_range("Voltage", 229000, 231000)
 
         self.step("5")
-        # After 5 seconds...
-        time.sleep(5)
+        # After 3 seconds...
+        time.sleep(3)
 
         self.step("5a")
         # Active power is Mandatory

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,12 @@ void FakeReadings::StartFakeReadings(EndpointId aEndpointId, int64_t aPower_mW,`
`93`	`93`
`94`	`94`	`if (bReset)`
`95`	`95`	`{`
	`96`	`+ // Use a fixed random seed to try to avoid random CI test failures`
	`97`	`+ // which are caused when the test is checking for 2 different numbers.`
	`98`	`+ // This is statistically more likely when the test runs for a long time`
	`99`	`+ // or if the seed is not set`
	`100`	`+ srand(1);`
	`101`	`+`
`96`	`102`	`mTotalEnergyImported = 0;`
`97`	`103`	`mTotalEnergyExported = 0;`
`98`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@`
`8`	`8`	`"mac-amd64",`
`9`	`9`	`"windows-amd64"`
`10`	`10`	`],`
`11`		`- "tags": ["version:2@v2024.07.10-nightly.1"]`
	`11`	`+ "tags": ["version:2@v2024.07.26-nightly.1"]`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",`
`15`	`15`	`"path": "fuchsia/third_party/zap/mac-amd64",`
`16`	`16`	`"platforms": ["mac-arm64"],`
`17`		`- "tags": ["version:2@v2024.07.10-nightly.1"]`
	`17`	`+ "tags": ["version:2@v2024.07.26-nightly.1"]`
`18`	`18`	`}`
`19`	`19`	`]`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-v2024.07.10-nightly`
	`1`	`+v2024.07.26-nightly`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`# Use scripts/tools/zap/version_update.py to manage ZAP versioning as many`
`24`	`24`	`# files may need updating for versions`
`25`	`25`	`#`
`26`		`-MIN_ZAP_VERSION = '2024.7.10'`
	`26`	`+MIN_ZAP_VERSION = '2024.7.26'`
`27`	`27`
`28`	`28`
`29`	`29`	`class ZapTool:`