From 603115dbc46f30feb6d50ed04491fb54fd793e18 Mon Sep 17 00:00:00 2001
From: Irene Bandera <irenebandera@eprosima.com>
Date: Mon, 12 Jun 2023 10:05:25 +0200
Subject: [PATCH] Apply changes

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
---
 .github/workflows/test.yml                    | 48 ++++++++++++++++---
 .../py_utils/unittest/system/test_System.py   |  5 --
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fcf69013..d26c69e3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -112,7 +112,7 @@ jobs:
             --metas src/dev-utils/.github/workflows/configurations/coverage_colcon.meta \
             --mixin coverage-gcc asan-gcc
 
-      - name: Run tests
+      - name: Run tests cpp_utils
         uses: ./src/dev-utils/.github/actions/run-test-ubuntu
         with:
           package_name: cpp_utils
@@ -205,7 +205,7 @@ jobs:
             --event-handlers=console_direct+ \
             --metas src/dev-utils/.github/workflows/configurations/asan_colcon.meta
 
-      - name: Run tests
+      - name: Run tests cpp_utils
         run: |
           source install/setup.bash && \
           colcon test \
@@ -272,7 +272,7 @@ jobs:
             --event-handlers=console_direct+ \
             --metas src/dev-utils/.github/workflows/configurations/tsan_colcon.meta
 
-      - name: Run tests
+      - name: Run tests cpp_utils
         run: |
           source install/setup.bash && \
           colcon test \
@@ -348,7 +348,7 @@ jobs:
             --event-handlers=console_direct+ \
             --cmake-args -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.cmake-config }}
 
-      - name: Run tests
+      - name: Run tests cpp_utils
         run: |
           source install/setup.bash && \
           colcon test \
@@ -359,6 +359,17 @@ jobs:
               --label-exclude xfail \
               --timeout 60
 
+      - name: Run tests py_utils
+        run: |
+          source install/setup.bash && \
+          colcon test \
+            --packages-select py_utils \
+            --event-handlers=console_direct+ \
+            --return-code-on-test-failure \
+            --ctest-args \
+              --label-exclude xfail \
+              --timeout 60
+
       - name: Upload Logs
         uses: actions/upload-artifact@v1
         with:
@@ -443,11 +454,18 @@ jobs:
       - name: Install cpp_utils
         uses: ./dev-utils/.github/actions/install-subpackage-windows
         with:
-          cmake_extra_args: ${{ env.W2019_CMAKE_EXTRA_ARGS }}
           cmake_build_type: ${{ matrix.cmake-config }}
           subpackage: cpp_utils
           subpackage_dir: cpp_utils
 
+      - name: Install py_utils
+        uses: ./dev-utils/.github/actions/install-subpackage-windows
+        with:
+          cmake_extra_args: ${{ env.W2019_CMAKE_EXTRA_ARGS }}
+          cmake_build_type: ${{ matrix.cmake-config }}
+          subpackage: py_utils
+          subpackage_dir: py_utils
+
       - name: Run tests cpp_utils
         uses: ./dev-utils/.github/actions/run-test-windows
         with:
@@ -455,6 +473,13 @@ jobs:
           cmake_build_type: ${{ matrix.cmake-config }}
         if: always()
 
+      - name: Run tests py_utils
+        uses: ./dev-utils/.github/actions/run-test-windows
+        with:
+          package_name: py_utils
+          cmake_build_type: ${{ matrix.cmake-config }}
+        if: always()
+
 ###########################################################
 # FLAKY TEST
   flaky-test:
@@ -504,7 +529,7 @@ jobs:
             --metas src/dev-utils/.github/workflows/configurations/coverage_colcon.meta \
             --mixin coverage-gcc asan-gcc
 
-      - name: Run tests
+      - name: Run tests cpp_utils
         run: |
           source install/setup.bash && \
           colcon test \
@@ -515,6 +540,17 @@ jobs:
               --label-regex xfail \
               --timeout 60
 
+      - name: Run tests py_utils
+        run: |
+          source install/setup.bash && \
+          colcon test \
+            --packages-select py_utils \
+            --event-handlers=console_direct+ \
+            --return-code-on-test-failure \
+            --ctest-args \
+              --label-regex xfail \
+              --timeout 60
+
 ###########################################################
 # CLANG TIDY
   clang-tidy:
diff --git a/py_utils/test/py_utils/unittest/system/test_System.py b/py_utils/test/py_utils/unittest/system/test_System.py
index 0a693969..89537b47 100644
--- a/py_utils/test/py_utils/unittest/system/test_System.py
+++ b/py_utils/test/py_utils/unittest/system/test_System.py
@@ -46,8 +46,3 @@ def test_is_windows():
     # Test case 3: Running the script on a different operating system
     os.name = 'mac'
     assert (is_windows() is False)
-
-
-# Run the tests
-test_is_linux()
-test_is_windows()