Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

slow follow exec #69

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 11 additions & 93 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ env:
ORC_COMPLETION_OUTPUT_DIR: /tmp

jobs:
unit_test:
with-follow-exec:
runs-on: ubuntu-latest
name: unit_test
name: with-follow-exec

steps:
- name: checkout
Expand All @@ -24,79 +24,15 @@ jobs:
with:
toolchain: stable

- name: run tests
run: make unit_test_coverage

- name: upload coverage
uses: codecov/codecov-action@v1
with:
flags: unit_test
fail_ci_if_error: true

integration_test:
runs-on: ubuntu-latest
name: integration_test
strategy:
matrix:
orthanc: [1.6.1, 1.7.4, 1.8.2]
services:
orthanc:
image: ch00k/orthanc-nginx:${{matrix.orthanc}}
ports:
- 8028:80
dino:
image: ch00k/dino
env:
DINO_SCP_HOST: ${{env.DINO_SCP_HOST}}
DINO_SCP_PORT: ${{env.DINO_SCP_PORT}}
DINO_SCP_AET: ${{env.DINO_SCP_AET}}
ports:
- 5252:5252
env:
ORC_ORTHANC_ADDRESS: http://localhost:8028
ORC_ORTHANC_USERNAME: orthanc
ORC_ORTHANC_PASSWORD: orthanc
ORC_DATAFILES_PATH: /tmp/orc_test_data
DINO_SCP_HOST: 0.0.0.0
DINO_SCP_PORT: 5252
DINO_SCP_AET: DINO

steps:
- name: checkout
uses: actions/checkout@v2

- name: prepare rust env
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: install tarpaulin
run: cargo install --git https://github.com/xd009642/tarpaulin.git --branch develop cargo-tarpaulin

- name: run tests
run: make integration_test
run: cargo tarpaulin --follow-exec --test slow -- --show-output

integration_test_coverage:
without-follow-exec:
runs-on: ubuntu-latest
name: integration_test_coverage
services:
orthanc:
image: ch00k/orthanc-nginx:1.8.2
ports:
- 8028:80
dino:
image: ch00k/dino
env:
DINO_SCP_HOST: ${{env.DINO_SCP_HOST}}
DINO_SCP_PORT: ${{env.DINO_SCP_PORT}}
DINO_SCP_AET: ${{env.DINO_SCP_AET}}
ports:
- 5252:5252
env:
ORC_ORTHANC_ADDRESS: http://localhost:8028
ORC_ORTHANC_USERNAME: orthanc
ORC_ORTHANC_PASSWORD: orthanc
ORC_DATAFILES_PATH: /tmp/orc_test_data
DINO_SCP_HOST: 0.0.0.0
DINO_SCP_PORT: 5252
DINO_SCP_AET: DINO
name: without-follow-exec

steps:
- name: checkout
Expand All @@ -107,27 +43,9 @@ jobs:
with:
toolchain: stable

- name: run tests
run: make integration_test_coverage

- name: upload coverage
uses: codecov/codecov-action@v1
with:
flags: integration_test
fail_ci_if_error: true

check_completion:
runs-on: ubuntu-latest
name: check_completion

steps:
- name: checkout
uses: actions/checkout@v2
- name: install tarpaulin
run: cargo install --git https://github.com/xd009642/tarpaulin.git --branch develop cargo-tarpaulin

- name: prepare rust env
uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: run tests
run: cargo tarpaulin --test slow -- --show-output

- name: run check
run: make check_completion
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@ path = "src/lib.rs"
[[test]]
name = "integration"
path = "tests/test.rs"

[[test]]
name = "slow"
path = "tests/slow.rs"
Loading