summaryrefslogtreecommitdiffhomepage
path: root/src/process/openvpn.rs
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-03-10 10:30:04 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-03-10 10:30:04 +0100
commitf4424ce56f5b08aa9ccbaa6d2d9660244164345c (patch)
tree6822ae4f23e00fd0635bcb899d4aeda078e409a9 /src/process/openvpn.rs
parentf2cc9fddc38eb7e3c75b2dccff8f135d30425c4d (diff)
parent2452184f6c68b8c43d4a3d061a34485942af4685 (diff)
downloadmullvadvpn-f4424ce56f5b08aa9ccbaa6d2d9660244164345c.tar.xz
mullvadvpn-f4424ce56f5b08aa9ccbaa6d2d9660244164345c.zip
Merge branch 'add-tests'
Diffstat (limited to 'src/process/openvpn.rs')
-rw-r--r--src/process/openvpn.rs32
1 files changed, 31 insertions, 1 deletions
diff --git a/src/process/openvpn.rs b/src/process/openvpn.rs
index a6af4742c3..b6d82f02a9 100644
--- a/src/process/openvpn.rs
+++ b/src/process/openvpn.rs
@@ -228,7 +228,7 @@ impl OpenVpnMonitor {
#[cfg(test)]
-mod tests {
+mod openvpn_command_tests {
use super::OpenVpnCommand;
use net::RemoteAddr;
use std::ffi::OsString;
@@ -277,4 +277,34 @@ mod tests {
assert!(testee_args.contains(&OsString::from("127.0.0.1")));
assert!(testee_args.contains(&OsString::from("99")));
}
+
+ #[test]
+ fn passes_plugin_path() {
+ let path = "./a/path";
+ let testee_args = OpenVpnCommand::new("").plugin(path, vec![]).get_arguments();
+ assert!(testee_args.contains(&OsString::from("./a/path")));
+ }
+
+ #[test]
+ fn passes_plugin_args() {
+ let args = vec![String::from("123"), String::from("cde")];
+ let testee_args = OpenVpnCommand::new("").plugin("", args).get_arguments();
+ assert!(testee_args.contains(&OsString::from("123")));
+ assert!(testee_args.contains(&OsString::from("cde")));
+ }
+}
+
+
+#[cfg(test)]
+mod openvpn_monitor_tests {
+ use super::*;
+
+ #[test]
+ fn stop_without_start() {
+ let command = OpenVpnCommand::new("");
+ let testee = OpenVpnMonitor::new(command, "");
+
+ use super::super::monitor::ErrorKind::InvalidState as MInvalidState;
+ assert_matches!(testee.stop(), Err(Error(ErrorKind::ChildMonitorError(MInvalidState), _)));
+ }
}