diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2016-12-05 10:03:25 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2016-12-05 14:44:05 +0100 |
| commit | b364aa395ee0ad9a418c3a75e19192cb817c7cf3 (patch) | |
| tree | 9673e2bb96ea9eff45e18372445aa686838ee87c | |
| parent | be59003d1f804dce1999b5e1e5d9780bff9143ad (diff) | |
| download | mullvadvpn-b364aa395ee0ad9a418c3a75e19192cb817c7cf3.tar.xz mullvadvpn-b364aa395ee0ad9a418c3a75e19192cb817c7cf3.zip | |
Limit RUST_TEST_THREADS to 1
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | tests/process.rs | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 50a05a487f..5b9368c0b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ rust: os: - linux - osx +env: + global: + - RUST_TEST_THREADS=1 before_script: - (cargo install rustfmt || true) diff --git a/tests/process.rs b/tests/process.rs index 2cc5e51147..2281a9d990 100644 --- a/tests/process.rs +++ b/tests/process.rs @@ -6,6 +6,16 @@ use talpid_core::process::OpenVpnBuilder; #[cfg(target_os = "linux")] #[test] +fn check_test_environment() { + use std::env; + let test_threads = env::var("RUST_TEST_THREADS"); + if !test_threads.is_ok() || test_threads.unwrap() != "1" { + panic!("Tests must be run with environment variable RUST_TEST_THREADS=1"); + } +} + +#[cfg(target_os = "linux")] +#[test] fn openvpn_builder_starts_correct_process() { let mut child = OpenVpnBuilder::new("echo").spawn().unwrap(); let args = util::read_args_for_proc(child.id()); |