Move integration tests to `mullvad-tests` crate

5 files changed, 16 insertions, 12 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 10e0145904..40a33d9083 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -750,11 +750,9 @@ dependencies = [
 name = "mullvad-daemon"
 version = "0.1.0"
 dependencies = [
- "assert_matches 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctrlc 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "duct 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fern 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -769,8 +767,6 @@ dependencies = [
  "mullvad-paths 0.1.0",
  "mullvad-rpc 0.1.0",
  "mullvad-types 0.1.0",
- "notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -779,7 +775,6 @@ dependencies = [
  "talpid-core 0.1.0",
  "talpid-ipc 0.1.0",
  "talpid-types 0.1.0",
- "tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -835,7 +830,13 @@ dependencies = [
 name = "mullvad-tests"
 version = "0.1.0"
 dependencies = [
+ "duct 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mullvad-ipc-client 0.1.0",
+ "mullvad-paths 0.1.0",
  "notify 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 26961a6265..e2120d34b5 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -42,10 +42,3 @@ simple-signal = "1.1"
 ctrlc = "3.0"
 windows-service = "0.1"
 winapi = "0.3"
-
-[dev-dependencies]
-assert_matches = "1.0"
-duct = "0.10"
-notify = "4.0"
-os_pipe = "0.6"
-tempfile = "3.0"
diff --git a/mullvad-tests/Cargo.toml b/mullvad-tests/Cargo.toml
index 5b3df950df..71dc7b8663 100644
--- a/mullvad-tests/Cargo.toml
+++ b/mullvad-tests/Cargo.toml
@@ -7,3 +7,13 @@ license = "GPL-3.0"
 
 [dependencies]
 notify = "4.0"
+
+[dev-dependencies]
+duct = "0.10"
+mullvad-ipc-client = { path = "../mullvad-ipc-client" }
+mullvad-paths = { path = "../mullvad-paths" }
+os_pipe = "0.6"
+tempfile = "3.0"
+
+[target.'cfg(unix)'.dev-dependencies]
+libc = "0.2"
diff --git a/mullvad-daemon/tests/common/mod.rs b/mullvad-tests/tests/common/mod.rs
index a93d1b1528..a93d1b1528 100644
--- a/mullvad-daemon/tests/common/mod.rs
+++ b/mullvad-tests/tests/common/mod.rs
diff --git a/mullvad-daemon/tests/startup.rs b/mullvad-tests/tests/startup.rs
index f9bb5d04f6..f9bb5d04f6 100644
--- a/mullvad-daemon/tests/startup.rs
+++ b/mullvad-tests/tests/startup.rs