From 4b2cff8db74e91e55e30fdf24143b15e2f4695d6 Mon Sep 17 00:00:00 2001 From: Andreas Fackler Date: Tue, 23 Jul 2019 16:19:15 +0200 Subject: [PATCH] Increase the Travis timeout. --- .travis.yml | 4 ++-- Cargo.toml | 2 +- ci.sh | 2 +- hbbft_testing/Cargo.toml | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 125512d..4bb53b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ rust: - 1.36.0 cache: cargo: true - timeout: 1200 + timeout: 2400 addons: apt: packages: @@ -21,4 +21,4 @@ before_install: # # causing a CI slowdown, so this option is commented out by default. It can # # be enabled per-branch to debug issues. # - sudo tail -n 250 /var/log/syslog -script: ./ci.sh +script: travis_wait 40 ./ci.sh diff --git a/Cargo.toml b/Cargo.toml index a209661..688c27e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ colored = "1.7" crossbeam = "0.7.1" crossbeam-channel = "0.3" docopt = "1.0" -hbbft_testing = { path = "hbbft_testing" } +hbbft_testing = { path = "hbbft_testing", features = ["use-insecure-test-only-mock-crypto"] } itertools = "0.8.0" signifix = "0.10.0" proptest = "0.9.2" diff --git a/ci.sh b/ci.sh index 47af93b..4bd6b43 100755 --- a/ci.sh +++ b/ci.sh @@ -23,7 +23,7 @@ cargo audit --ignore RUSTSEC-2019-0011 cd hbbft_testing cargo clippy --all-targets -- --deny clippy::all cargo fmt -- --check -cargo test --release +cargo test --features=use-insecure-test-only-mock-crypto --release # TODO: Remove exception once https://github.com/poanetwork/hbbft/issues/415 is fixed. cargo audit --ignore RUSTSEC-2019-0011 cd .. diff --git a/hbbft_testing/Cargo.toml b/hbbft_testing/Cargo.toml index 0697fcb..e548ccb 100644 --- a/hbbft_testing/Cargo.toml +++ b/hbbft_testing/Cargo.toml @@ -29,3 +29,6 @@ proptest = "0.9.2" rand = "0.6.5" rand_xorshift = "0.1.1" threshold_crypto = "0.3.1" + +[features] +use-insecure-test-only-mock-crypto = ["hbbft/use-insecure-test-only-mock-crypto"]