Address code review comments

- Revert time bumps
- Add a main function to all the newly added python scripts
- Add documentation on WaitForMessage API

.github/workflows/tests.yaml

@@ -28,7 +28,7 @@ concurrency:
 jobs:
     test_suites_linux:
         name: Test Suites - Linux
-        timeout-minutes: 130
+        timeout-minutes: 120
 
         strategy:
             matrix:
@@ -76,7 +76,7 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build Apps
-              timeout-minutes: 40
+              timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -121,7 +121,7 @@ jobs:
                   retention-days: 5
     test_suites_darwin:
         name: Test Suites - Darwin
-        timeout-minutes: 130
+        timeout-minutes: 120
 
         strategy:
             matrix:
@@ -176,7 +176,7 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build Apps
-              timeout-minutes: 40
+              timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \

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

@@ -49,6 +49,8 @@ class DelayCommands
         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,
                               const chip::app::Clusters::DelayCommands::Commands::WaitForMessage::Type & value);
 

src/app/tests/suites/commands/delay/scripts/WaitForMessage.py

@@ -23,5 +23,11 @@
 if sys.platform == 'linux':
     IP = '10.10.10.5'
 
-with xmlrpc.client.ServerProxy('http://' + IP + ':' + str(PORT) + '/', allow_none=True) as proxy:
-    proxy.waitForMessage(sys.argv[1], sys.argv[2:])
+
+def main():
+    with xmlrpc.client.ServerProxy('http://' + IP + ':' + str(PORT) + '/', allow_none=True) as proxy:
+        proxy.waitForMessage(sys.argv[1], sys.argv[2:])
+
+
+if __name__ == "__main__":
+    main()

src/app/tests/suites/commands/system/scripts/CompareFiles.py

@@ -20,5 +20,11 @@
 file1 = sys.argv[1]
 file2 = sys.argv[2]
 
-if filecmp.cmp(file1, file2, shallow=False) is False:
-    raise Exception('Files %s and %s do not match' % (file1, file2))
+
+def main():
+    if filecmp.cmp(file1, file2, shallow=False) is False:
+        raise Exception('Files %s and %s do not match' % (file1, file2))
+
+
+if __name__ == "__main__":
+    main()

src/app/tests/suites/commands/system/scripts/CreateOtaImage.py

@@ -25,15 +25,21 @@
 rawImageFilePath = sys.argv[2]
 rawImageContent = ' '.join(sys.argv[3:])
 
-# Write the raw image content
-with open(rawImageFilePath, 'w') as rawFile:
-    rawFile.write(rawImageContent)
-
-# Add an OTA header to the raw file
-otaImageTool = DEFAULT_CHIP_ROOT + '/src/app/ota_image_tool.py'
-cmd = [otaImageTool, 'create', '-v', '0xDEAD', '-p', '0xBEEF', '-vn', '2',
-       '-vs', "2.0", '-da', 'sha256', rawImageFilePath, otaImageFilePath]
-s = subprocess.Popen(cmd)
-s.wait()
-if s.returncode != 0:
-    raise Exception('Cannot create OTA image file')
+
+def main():
+    # Write the raw image content
+    with open(rawImageFilePath, 'w') as rawFile:
+        rawFile.write(rawImageContent)
+
+    # Add an OTA header to the raw file
+    otaImageTool = DEFAULT_CHIP_ROOT + '/src/app/ota_image_tool.py'
+    cmd = [otaImageTool, 'create', '-v', '0xDEAD', '-p', '0xBEEF', '-vn', '2',
+           '-vs', "2.0", '-da', 'sha256', rawImageFilePath, otaImageFilePath]
+    s = subprocess.Popen(cmd)
+    s.wait()
+    if s.returncode != 0:
+        raise Exception('Cannot create OTA image file')
+
+
+if __name__ == "__main__":
+    main()