[CI] Remove unused DelayCommands functions

scripts/tests/chiptest/accessories.py

@@ -92,18 +92,6 @@ def factoryReset(self, name):
             return accessory.factoryReset()
         return False
 
-    def waitForCommissionableAdvertisement(self, name):
-        accessory = self.__accessories[name]
-        if accessory:
-            return accessory.waitForCommissionableAdvertisement()
-        return False
-
-    def waitForOperationalAdvertisement(self, name):
-        accessory = self.__accessories[name]
-        if accessory:
-            return accessory.waitForOperationalAdvertisement()
-        return False
-
     def waitForMessage(self, name, message):
         accessory = self.__accessories[name]
         if accessory:
@@ -119,15 +107,7 @@ def __startXMLRPCServer(self):
         self.server.register_function(self.stop, 'stop')
         self.server.register_function(self.reboot, 'reboot')
         self.server.register_function(self.factoryReset, 'factoryReset')
-        self.server.register_function(
-            self.waitForCommissionableAdvertisement,
-            'waitForCommissionableAdvertisement')
-        self.server.register_function(
-            self.waitForOperationalAdvertisement,
-            'waitForOperationalAdvertisement')
-        self.server.register_function(
-            self.waitForMessage,
-            'waitForMessage')
+        self.server.register_function(self.waitForMessage, 'waitForMessage')
 
         self.server_thread = threading.Thread(target=self.server.serve_forever)
         self.server_thread.start()

scripts/tests/chiptest/test_definition.py

@@ -79,16 +79,6 @@ def factoryReset(self):
     def waitForAnyAdvertisement(self):
         self.__waitFor("mDNS service published:", self.process, self.outpipe)
 
-    def waitForCommissionableAdvertisement(self):
-        self.__waitFor("mDNS service published: _matterc._udp",
-                       self.process, self.outpipe)
-        return True
-
-    def waitForOperationalAdvertisement(self):
-        self.__waitFor("mDNS service published: _matter._tcp",
-                       self.process, self.outpipe)
-        return True
-
     def waitForMessage(self, message):
         self.__waitFor(message, self.process, self.outpipe)
         return True

src/app/tests/suites/commands/delay/DelayCommands.cpp

@@ -41,28 +41,6 @@ void DelayCommands::OnWaitForMsFn(chip::System::Layer * systemLayer, void * cont
     command->OnWaitForMs();
 }
 
-CHIP_ERROR DelayCommands::WaitForCommissionableAdvertisement(
-    const char * identity, const chip::app::Clusters::DelayCommands::Commands::WaitForCommissionableAdvertisement::Type & value)
-{
-    const char * scriptDir            = getScriptsFolder();
-    constexpr const char * scriptName = "WaitForCommissionableAdvertisement.py";
-
-    char command[128];
-    VerifyOrReturnError(snprintf(command, sizeof(command), "%s%s", scriptDir, scriptName) >= 0, CHIP_ERROR_INTERNAL);
-    return RunInternal(command);
-}
-
-CHIP_ERROR DelayCommands::WaitForOperationalAdvertisement(
-    const char * identity, const chip::app::Clusters::DelayCommands::Commands::WaitForOperationalAdvertisement::Type & value)
-{
-    const char * scriptDir            = getScriptsFolder();
-    constexpr const char * scriptName = "WaitForOperationalAdvertisement.py";
-
-    char command[128];
-    VerifyOrReturnError(snprintf(command, sizeof(command), "%s%s", scriptDir, scriptName) >= 0, CHIP_ERROR_INTERNAL);
-    return RunInternal(command);
-}
-
 CHIP_ERROR DelayCommands::WaitForMessage(const char * identity,
                                          const chip::app::Clusters::DelayCommands::Commands::WaitForMessage::Type & value)
 {

src/app/tests/suites/commands/delay/DelayCommands.h

@@ -44,11 +44,6 @@ class DelayCommands
         return CHIP_ERROR_NOT_IMPLEMENTED;
     };
     CHIP_ERROR WaitForMs(const char * identity, const chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type & value);
-    CHIP_ERROR WaitForCommissionableAdvertisement(
-        const char * identity,
-        const chip::app::Clusters::DelayCommands::Commands::WaitForCommissionableAdvertisement::Type & value);
-    CHIP_ERROR WaitForOperationalAdvertisement(
-        const char * identity, const chip::app::Clusters::DelayCommands::Commands::WaitForOperationalAdvertisement::Type & value);
     // Wait for any message specified by value.message for the application specified by value.registerKey
     // If the message is never seen, a timeout would occur
     CHIP_ERROR WaitForMessage(const char * identity,

src/app/zap-templates/common/simulated-clusters/clusters/DelayCommands.js

@@ -38,24 +38,13 @@ const WaitForCommissionee = {
   arguments : [ { type : 'NODE_ID', name : 'nodeId' } ],
 };
 
-const WaitForCommissionableAdvertisement = {
-  name : 'WaitForCommissionableAdvertisement',
-};
-
-const WaitForOperationalAdvertisement = {
-  name : 'WaitForOperationalAdvertisement',
-};
-
 const WaitForMessage = {
   name : 'WaitForMessage',
   arguments : [ { type : 'CHAR_STRING', name : 'registerKey', isOptional : true }, { type : 'CHAR_STRING', name : 'message' } ],
 };
 
 const name     = 'DelayCommands';
-const commands = [
-  WaitForMs, WaitForCommissioning, WaitForCommissionee, WaitForCommissionableAdvertisement, WaitForOperationalAdvertisement,
-  WaitForMessage
-];
+const commands = [ WaitForMs, WaitForCommissioning, WaitForCommissionee, WaitForMessage ];
 
 const DelayCommands = {
   name,