Skip to content

Commit 603115d

Browse files
committed
Apply changes
Signed-off-by: Irene Bandera <[email protected]>
1 parent 3342f9d commit 603115d

File tree

2 files changed

+42
-11
lines changed

2 files changed

+42
-11
lines changed

.github/workflows/test.yml

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
--metas src/dev-utils/.github/workflows/configurations/coverage_colcon.meta \
113113
--mixin coverage-gcc asan-gcc
114114
115-
- name: Run tests
115+
- name: Run tests cpp_utils
116116
uses: ./src/dev-utils/.github/actions/run-test-ubuntu
117117
with:
118118
package_name: cpp_utils
@@ -205,7 +205,7 @@ jobs:
205205
--event-handlers=console_direct+ \
206206
--metas src/dev-utils/.github/workflows/configurations/asan_colcon.meta
207207
208-
- name: Run tests
208+
- name: Run tests cpp_utils
209209
run: |
210210
source install/setup.bash && \
211211
colcon test \
@@ -272,7 +272,7 @@ jobs:
272272
--event-handlers=console_direct+ \
273273
--metas src/dev-utils/.github/workflows/configurations/tsan_colcon.meta
274274
275-
- name: Run tests
275+
- name: Run tests cpp_utils
276276
run: |
277277
source install/setup.bash && \
278278
colcon test \
@@ -348,7 +348,7 @@ jobs:
348348
--event-handlers=console_direct+ \
349349
--cmake-args -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=${{ matrix.cmake-config }}
350350
351-
- name: Run tests
351+
- name: Run tests cpp_utils
352352
run: |
353353
source install/setup.bash && \
354354
colcon test \
@@ -359,6 +359,17 @@ jobs:
359359
--label-exclude xfail \
360360
--timeout 60
361361
362+
- name: Run tests py_utils
363+
run: |
364+
source install/setup.bash && \
365+
colcon test \
366+
--packages-select py_utils \
367+
--event-handlers=console_direct+ \
368+
--return-code-on-test-failure \
369+
--ctest-args \
370+
--label-exclude xfail \
371+
--timeout 60
372+
362373
- name: Upload Logs
363374
uses: actions/upload-artifact@v1
364375
with:
@@ -443,18 +454,32 @@ jobs:
443454
- name: Install cpp_utils
444455
uses: ./dev-utils/.github/actions/install-subpackage-windows
445456
with:
446-
cmake_extra_args: ${{ env.W2019_CMAKE_EXTRA_ARGS }}
447457
cmake_build_type: ${{ matrix.cmake-config }}
448458
subpackage: cpp_utils
449459
subpackage_dir: cpp_utils
450460

461+
- name: Install py_utils
462+
uses: ./dev-utils/.github/actions/install-subpackage-windows
463+
with:
464+
cmake_extra_args: ${{ env.W2019_CMAKE_EXTRA_ARGS }}
465+
cmake_build_type: ${{ matrix.cmake-config }}
466+
subpackage: py_utils
467+
subpackage_dir: py_utils
468+
451469
- name: Run tests cpp_utils
452470
uses: ./dev-utils/.github/actions/run-test-windows
453471
with:
454472
package_name: cpp_utils
455473
cmake_build_type: ${{ matrix.cmake-config }}
456474
if: always()
457475

476+
- name: Run tests py_utils
477+
uses: ./dev-utils/.github/actions/run-test-windows
478+
with:
479+
package_name: py_utils
480+
cmake_build_type: ${{ matrix.cmake-config }}
481+
if: always()
482+
458483
###########################################################
459484
# FLAKY TEST
460485
flaky-test:
@@ -504,7 +529,7 @@ jobs:
504529
--metas src/dev-utils/.github/workflows/configurations/coverage_colcon.meta \
505530
--mixin coverage-gcc asan-gcc
506531
507-
- name: Run tests
532+
- name: Run tests cpp_utils
508533
run: |
509534
source install/setup.bash && \
510535
colcon test \
@@ -515,6 +540,17 @@ jobs:
515540
--label-regex xfail \
516541
--timeout 60
517542
543+
- name: Run tests py_utils
544+
run: |
545+
source install/setup.bash && \
546+
colcon test \
547+
--packages-select py_utils \
548+
--event-handlers=console_direct+ \
549+
--return-code-on-test-failure \
550+
--ctest-args \
551+
--label-regex xfail \
552+
--timeout 60
553+
518554
###########################################################
519555
# CLANG TIDY
520556
clang-tidy:

py_utils/test/py_utils/unittest/system/test_System.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,3 @@ def test_is_windows():
4646
# Test case 3: Running the script on a different operating system
4747
os.name = 'mac'
4848
assert (is_windows() is False)
49-
50-
51-
# Run the tests
52-
test_is_linux()
53-
test_is_windows()

0 commit comments

Comments
 (0)