Skip to content

Commit 9d7090e

Browse files
committed
Apply changes
Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
1 parent 3342f9d commit 9d7090e

2 files changed

Lines changed: 42 additions & 10 deletions

File tree

.github/workflows/test.yml

Lines changed: 42 additions & 5 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:
@@ -448,13 +459,28 @@ jobs:
448459
subpackage: cpp_utils
449460
subpackage_dir: cpp_utils
450461

462+
- name: Install py_utils
463+
uses: ./dev-utils/.github/actions/install-subpackage-windows
464+
with:
465+
cmake_extra_args: ${{ env.W2019_CMAKE_EXTRA_ARGS }}
466+
cmake_build_type: ${{ matrix.cmake-config }}
467+
subpackage: py_utils
468+
subpackage_dir: py_utils
469+
451470
- name: Run tests cpp_utils
452471
uses: ./dev-utils/.github/actions/run-test-windows
453472
with:
454473
package_name: cpp_utils
455474
cmake_build_type: ${{ matrix.cmake-config }}
456475
if: always()
457476

477+
- name: Run tests py_utils
478+
uses: ./dev-utils/.github/actions/run-test-windows
479+
with:
480+
package_name: py_utils
481+
cmake_build_type: ${{ matrix.cmake-config }}
482+
if: always()
483+
458484
###########################################################
459485
# FLAKY TEST
460486
flaky-test:
@@ -504,7 +530,7 @@ jobs:
504530
--metas src/dev-utils/.github/workflows/configurations/coverage_colcon.meta \
505531
--mixin coverage-gcc asan-gcc
506532
507-
- name: Run tests
533+
- name: Run tests cpp_utils
508534
run: |
509535
source install/setup.bash && \
510536
colcon test \
@@ -515,6 +541,17 @@ jobs:
515541
--label-regex xfail \
516542
--timeout 60
517543
544+
- name: Run tests py_utils
545+
run: |
546+
source install/setup.bash && \
547+
colcon test \
548+
--packages-select py_utils \
549+
--event-handlers=console_direct+ \
550+
--return-code-on-test-failure \
551+
--ctest-args \
552+
--label-regex xfail \
553+
--timeout 60
554+
518555
###########################################################
519556
# CLANG TIDY
520557
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)