summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-01-16 14:51:58 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-01-16 14:51:58 +0100
commit6ef4fdb0ad184ef82f61ff8d0cb5dadfef76145e (patch)
tree6f4a56974f82a464149743b377afa4c3b4ef8c69
parent4d91395f6fdad1792bf0b1610f2c978bc9d1d987 (diff)
downloadmullvadvpn-6ef4fdb0ad184ef82f61ff8d0cb5dadfef76145e.tar.xz
mullvadvpn-6ef4fdb0ad184ef82f61ff8d0cb5dadfef76145e.zip
Delete tests relying on timing luck
-rw-r--r--tests/process.rs36
-rw-r--r--tests/util.rs16
2 files changed, 0 insertions, 52 deletions
diff --git a/tests/process.rs b/tests/process.rs
deleted file mode 100644
index 149cb8e612..0000000000
--- a/tests/process.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-extern crate talpid_core;
-
-mod util;
-
-use talpid_core::process::OpenVpnCommand;
-
-#[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 = OpenVpnCommand::new("echo").spawn().unwrap();
- let args = util::read_args_for_proc(child.id());
-
- assert_eq!(vec!["echo"], args);
- child.kill().unwrap();
-}
-
-#[cfg(target_os = "linux")]
-#[test]
-fn openvpn_builder_passes_config() {
- let config_path = "/path/to/config".to_owned();
- let mut child = OpenVpnCommand::new("echo").config(&config_path).spawn().unwrap();
- let args = util::read_args_for_proc(child.id());
-
- assert!(args.contains(&config_path));
- child.kill().unwrap();
-}
diff --git a/tests/util.rs b/tests/util.rs
deleted file mode 100644
index 8fe87e5783..0000000000
--- a/tests/util.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use std::fs::File;
-use std::io::Read;
-use std::path::Path;
-
-pub fn read_file<P: AsRef<Path>>(path: P) -> String {
- let mut string = String::new();
- let mut f = File::open(path).unwrap();
- f.read_to_string(&mut string).unwrap();
- string
-}
-
-#[cfg(target_os = "linux")]
-pub fn read_args_for_proc(pid: u32) -> Vec<String> {
- let cmdline = read_file(format!("/proc/{}/cmdline", pid));
- cmdline.split_terminator('\0').map(String::from).collect()
-}