ch: Make integration tests rely on external test_infra crate

Instead of copying the test_infra crate content, let's rely on it directly from the cloud-hypervisor/cloud-hypervisor repository. Signed-off-by: Sebastien Boeuf <[email protected]>
cloud-hypervisor · Mar 26, 2021 · 50f89ee · 50f89ee
1 parent 9f66275
commit 50f89ee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 591 deletions.
diff --git a/ch_integration_tests/Cargo.lock b/ch_integration_tests/Cargo.lock
diff --git a/ch_integration_tests/Cargo.toml b/ch_integration_tests/Cargo.toml
@@ -8,9 +8,10 @@ license = "LICENSE-APACHE"
 [dev-dependencies]
 dirs = "3.0.1"
 epoll = "4.3.1"
-libc = "0.2.90"
+libc = ">=0.2.91"
 lazy_static= "1.4.0"
 ssh2 = "0.9.1"
+test_infra = { git = "https://github.com/cloud-hypervisor/cloud-hypervisor" }
 uuid = { version = "0.8", features = ["v4"] }
 vmm-sys-util = "0.8.0"
-wait-timeout = "0.2.0"
+wait-timeout = "0.2.0"
diff --git a/ch_integration_tests/tests/integration.rs b/ch_integration_tests/tests/integration.rs
@@ -7,13 +7,9 @@
 #[macro_use]
 extern crate lazy_static;
 
-#[cfg(test)]
-#[allow(dead_code)]
-mod test_infra;
-
 #[cfg(test)]
 mod tests {
-    use crate::test_infra::{
+    use test_infra::{
         DiskConfig, DiskType, GuestNetworkConfig, UbuntuDiskConfig, WaitForBootError,
     };
     use std::io::{self, Write};