[chiptest] Add support for door lock app tests

project-chip · Mar 2, 2022 · 84f5dab · 84f5dab
1 parent b834c0d
commit 84f5dab
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -80,6 +80,7 @@ jobs:
                      "./scripts/build/build_examples.py \
                         --target linux-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT} \
                         --target linux-x64-all-clusters-${BUILD_VARIANT}-test-group \
+                        --target linux-x64-door-lock-${BUILD_VARIANT} \
                         --target linux-x64-tv-app-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
@@ -93,6 +94,7 @@ jobs:
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}-test-group/chip-all-clusters-app \
+                     --door-lock-app ./out/linux-x64-door-lock-${BUILD_VARIANT}/chip-door-lock-app \
                      --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                   "
             - name: Uploading core files
@@ -180,7 +182,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
-                     --target-skip-glob '{TestGroupMessaging,TV_*}' \
+                     --target-skip-glob '{TestGroupMessaging,DL_*,TV_*}' \
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \

diff --git a/scripts/tests/chiptest/linux.py b/scripts/tests/chiptest/linux.py
@@ -144,5 +144,6 @@ def PathsWithNetworkNamespaces(paths: ApplicationPaths) -> ApplicationPaths:
     return ApplicationPaths(
         chip_tool='ip netns exec tool'.split() + paths.chip_tool,
         all_clusters_app='ip netns exec app'.split() + paths.all_clusters_app,
+        door_lock_app='ip netns exec app'.split() + paths.door_lock_app,
         tv_app='ip netns exec app'.split() + paths.tv_app,
     )
diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py
@@ -146,6 +146,7 @@ class TestTarget(Enum):
 class ApplicationPaths:
     chip_tool: typing.List[str]
     all_clusters_app: typing.List[str]
+    door_lock_app: typing.List[str]
     tv_app: typing.List[str]
 
 
@@ -206,10 +207,7 @@ def Run(self, runner, apps_register, paths: ApplicationPaths):
             elif self.target == TestTarget.TV:
                 app_cmd = paths.tv_app
             elif self.target == TestTarget.DOOR_LOCK:
-                logging.info(
-                    "Ignore test - test is made for door lock which"
-                    " is not supported yet")
-                return
+                app_cmd = paths.door_lock_app
             else:
                 raise Exception("Unknown test target - "
                                 "don't know which application to run")

diff --git a/scripts/tests/run_test_suite.py b/scripts/tests/run_test_suite.py
@@ -167,18 +167,23 @@ def cmd_list(context):
     '--all-clusters-app',
     default=FindBinaryPath('chip-all-clusters-app'),
     help='what all clusters app to use')
+@click.option(
+    '--door-lock-app',
+    default=FindBinaryPath('chip-door-lock-app'),
+    help='what door lock app to use')
 @click.option(
     '--tv-app',
     default=FindBinaryPath('chip-tv-app'),
     help='what tv app to use')
 @click.pass_context
-def cmd_run(context, iterations, all_clusters_app, tv_app):
+def cmd_run(context, iterations, all_clusters_app, door_lock_app, tv_app):
     runner = chiptest.runner.Runner()
 
     # Command execution requires an array
     paths = chiptest.ApplicationPaths(
         chip_tool=[context.obj.chip_tool],
         all_clusters_app=[all_clusters_app],
+        door_lock_app=[door_lock_app],
         tv_app=[tv_app]
     )