Execution of integration tests as part of devcontainer automated tests (

#44)
eclipse-velocitas · Sep 22, 2023 · 746837c · 746837c
1 parent cbb37c6
commit 746837c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -127,7 +127,7 @@ jobs:
       - name: Run integration tests for k3d
         run: |
           cd runtime_k3d/test
-          pytest -s ./integration/integration_test.py
+          pytest -s ./integration/integration_test.py::test_scripts_run_successfully_with_down
 
       - name: Upload log files as artifacts
         if: always()
@@ -173,7 +173,7 @@ jobs:
           cd runtime_kanto/test
           # the socket on the ci is different to the devcontainer
           sudo ln -s /run/containerd/containerd.sock /run/docker/containerd/containerd.sock
-          pytest -s -x ./integration/integration_test.py
+          pytest -s -x ./integration/integration_test.py::test_scripts_run_successfully_with_down
 
       - name: Upload log files as artifacts
         if: always()

diff --git a/runtime_k3d/test/integration/integration_test.py b/runtime_k3d/test/integration/integration_test.py
@@ -91,4 +91,8 @@ def test_scripts_run_successfully():
     assert check_image_if_created(image_reg)
     assert run_command(f"{BASE_COMMAND_DEPLOYMENT} deploy-vehicleapp")
     assert check_pods(pods_regs)
+
+
+def test_scripts_run_successfully_with_down():
+    test_scripts_run_successfully()
     assert run_command(f"{BASE_COMMAND_RUNTIME} down")
diff --git a/runtime_kanto/test/integration/integration_test.py b/runtime_kanto/test/integration/integration_test.py
@@ -111,4 +111,8 @@ def test_scripts_run_successfully():
         f"{BASE_COMMAND_DEPLOYMENT} deploy-vehicleapp", regex_deploy
     )
     assert check_container_is_running("sampleapp")
+
+
+def test_scripts_run_successfully_with_down():
+    test_scripts_run_successfully()
     assert run_command_until_logs_match(f"{BASE_COMMAND_RUNTIME} down", regex_stop)
diff --git a/runtime_local/test/integration/integration_test.py b/runtime_local/test/integration/integration_test.py
@@ -65,7 +65,7 @@ def run_command_until_logs_match(command: str, regex_service: Pattern[str]) -> b
     return True
 
 
-def test_runtime_up_successfully():
+def test_scripts_run_successfully():
     create_dummy_vspec_file()
     assert run_command_until_logs_match(f"{command} up", regex_runtime_up)