Update TestDiscovery.yaml by enabling a few more steps (#25276)

* Update TestDiscovery.yaml by enabling a few more steps * Update generated tests code
project-chip · Nov 8, 2023 · 1077755 · 1077755
1 parent 8cf595e
commit 1077755
Show file tree

Hide file tree

Showing 4 changed files with 136 additions and 66 deletions.
diff --git a/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h b/examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h
@@ -32,3 +32,6 @@
 
 // Allows app options (ports) to be configured on launch of app
 #define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
+
+// Expose the device type in the advertisement for CI testing.
+#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml
@@ -31,7 +31,7 @@ config:
         defaultValue: 32769
     deviceType:
         type: int16u
-        defaultValue: 5
+        defaultValue: 65535
 
 tests:
     - label: "Stop target device"
@@ -105,23 +105,19 @@ tests:
 
     - label: "Check Hostname"
       PICS: "(MCORE.COM.WIFI || MCORE.COM.ETH) && !MCORE.COM.THR"
-      # On macOS the hostname is the device name and because of it this test is disabled for now.
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
           values:
               - name: "hostName"
                 constraints:
                     minLength: 12
-                    maxLength: 12
+                    maxLength: 16
                     isUpperCase: true
                     isHexString: true
 
     - label: "Check Hostname"
       PICS: "(!MCORE.COM.WIFI && !MCORE.COM.ETH) && MCORE.COM.THR"
-      # On macOS the hostname is the device name and because of it this test is disabled for now.
-      disabled: true
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
@@ -165,8 +161,6 @@ tests:
                 value: vendorId
 
     - label: "Check Device Type ID (_T)"
-      # The device type is not broadcasted by the accessory under CI.
-      disabled: true
       PICS: MCORE.SC.DEVTYPE_SUBTYPE
       cluster: "DiscoveryCommands"
       command: "FindCommissionableByDeviceType"
@@ -217,6 +211,7 @@ tests:
           values:
               - name: "mrpRetryIntervalIdle"
                 constraints:
+                    minValue: 0
                     maxValue: 3600000
 
     - label: "Optional TXT key for MRP Sleepy Active Interval (SAI)"
@@ -227,6 +222,7 @@ tests:
           values:
               - name: "mrpRetryIntervalActive"
                 constraints:
+                    minValue: 0
                     maxValue: 3600000
 
     - label: "TXT key for commissioning mode (CM)"
@@ -238,18 +234,13 @@ tests:
                 value: 1
 
     - label: "Optional TXT key for device type (DT)"
-      disabled: true
       PICS: MCORE.SC.DT_KEY
       cluster: "DiscoveryCommands"
       command: "FindCommissionable"
       response:
           values:
               - name: "deviceType"
                 value: deviceType
-                constraints:
-                    # The specification says this is a number expressed as <ddd>, but it seems like it can goes
-                    # up to 0xBFFF (49151).
-                    maxValue: 999
 
     - label: "Optional TXT key for device name (DN)"
       PICS: MCORE.SC.DN_KEY

diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
@@ -1835,7 +1835,7 @@ MCORE.SC.DEVTYPE_SUBTYPE=1
 MCORE.SC.VP_KEY=1
 MCORE.SC.DT_KEY=1
 MCORE.SC.DN_KEY=1
-MCORE.SC.RI_KEY=1
+MCORE.SC.RI_KEY=0
 MCORE.SC.PH_KEY=1
 MCORE.SC.PI_KEY=1
 MCORE.SC.EXTENDED_DISCOVERY=1