ci: fix with_coverage, isolate not unstable but extra_functional (

#4573) * ci: redefine `with_coverage` step to exclude `integration` tests * ci: isolate `extra_functional` from `integration` tests Signed-off-by: Shunkichi Sato <[email protected]>
hyperledger · May 14, 2024 · f361dd9 · f361dd9
1 parent 1606d08
commit f361dd9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
@@ -36,6 +36,7 @@ jobs:
         if: always()
         run: ./scripts/tests/consistency.sh docker-compose
 
+  # exclude: client/tests/integration/
   with_coverage:
     runs-on: [self-hosted, Linux, iroha2]
     container:
@@ -44,7 +45,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - name: Run tests, with coverage
-        run: mold --run cargo test --all-features --workspace --no-fail-fast
+        run: |
+          mold --run cargo test --all-features --no-fail-fast --workspace --exclude iroha_client
+          mold --run cargo test --all-features --no-fail-fast -p iroha_client -- --skip integration
         env:
           RUSTFLAGS: "-C instrument-coverage"
           LLVM_PROFILE_FILE: "iroha-%p-%m.profraw"
@@ -66,6 +69,8 @@ jobs:
           name: lcov.info
           path: lcov.info
 
+  # include: client/tests/integration/
+  # exclude: client/tests/integration/extra_functional
   integration:
     runs-on: [self-hosted, Linux, iroha2]
     container:
@@ -75,11 +80,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - name: Run tests, with no-default-features
-        run: |
-          mold --run cargo test --test mod --no-default-features -- \
-          integration:: --skip unstable_network
+        run: mold --run cargo test --no-default-features --no-fail-fast -p iroha_client integration -- --skip extra_functional
 
-  unstable:
+  # include: client/tests/integration/extra_functional
+  extra_functional:
     runs-on: [self-hosted, Linux, iroha2]
     container:
       image: hyperledger/iroha2-ci:nightly-2024-04-18
@@ -88,7 +92,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - name: Run tests
-        run: mold --run cargo test -p iroha_client --tests --no-default-features unstable_network --quiet
+        run: mold --run cargo test --no-default-features --no-fail-fast -p iroha_client extra_functional
 
   # Run the job to check that the docker containers are properly buildable
   pr-generator-build:

diff --git a/client/tests/mod.rs b/client/tests/mod.rs
@@ -1,2 +1 @@
-#[cfg(not(coverage))]
 mod integration;
diff --git a/p2p/tests/mod.rs b/p2p/tests/mod.rs
@@ -1,2 +1 @@
-#[cfg(not(coverage))]
 mod integration;