Skip to content

Commit 58251dc

Browse files
authored
Merge pull request #37 from hug-dev/test-client-timeout
Use new version of test client to fix CI
2 parents db7b5f7 + 149cbda commit 58251dc

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- uses: actions/checkout@v1
39+
- run: cargo build --verbose
3940
- run: |
4041
cargo run &
41-
sleep 5
4242
cargo test --test normal
4343
4444
integ-test-persistence:
4545
name: Persistence integration tests
4646
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v1
49+
- run: cargo build --verbose
4950
- name: Tests executed before the shutdown
5051
run: |
5152
cargo run &
5253
SERVER_PID=$!
53-
sleep 5
5454
cargo test --test persistent-before
5555
kill $SERVER_PID
5656
# Create a fake mapping file for the root application, the Mbed Provider and
@@ -63,6 +63,5 @@ jobs:
6363
- name: Tests executed after the shutdown
6464
run: |
6565
cargo run &
66-
sleep 5
6766
cargo test --test persistent-after
6867

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ uuid = "0.7.4"
1313
threadpool = "1.7.1"
1414

1515
[dev-dependencies]
16-
parsec-client-test = { git = "https://github.com/parallaxsecond/parsec-client-test", tag = "0.1.0" }
16+
parsec-client-test = { git = "https://github.com/parallaxsecond/parsec-client-test", tag = "0.1.1" }
1717

1818
[build-dependencies]
1919
bindgen = "0.50.0"

tests/all.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ cargo clippy || exit 1
4444
############################
4545
cargo run &
4646
SERVER_PID=$!
47-
sleep 5
4847

4948
cargo test --test normal || exit 1
5049

@@ -55,7 +54,6 @@ kill $SERVER_PID
5554
#################################
5655
cargo run &
5756
SERVER_PID=$!
58-
sleep 5
5957

6058
cargo test --test persistent-before || exit 1
6159

@@ -69,7 +67,6 @@ printf '\xe0\x19\xb2\x5c' > mappings/cm9vdA==/1/VGVzdCBLZXk\=
6967

7068
cargo run &
7169
SERVER_PID=$!
72-
sleep 5
7370

7471
cargo test --test persistent-after || exit 1
7572

0 commit comments

Comments
 (0)