clean up build warnings

Author: davepacheco

omicron-nexus/tests/api_common/mod.rs

@@ -0,0 +1,14 @@
+/*!
+ * Shared integration testing facilities for testing API endpoints
+ */
+
+use omicron_common::api::external::IdentityMetadata;
+
+/** Returns whether the two identity metadata objects are identical. */
+pub fn identity_eq(ident1: &IdentityMetadata, ident2: &IdentityMetadata) {
+    assert_eq!(ident1.id, ident2.id);
+    assert_eq!(ident1.name, ident2.name);
+    assert_eq!(ident1.description, ident2.description);
+    assert_eq!(ident1.time_created, ident2.time_created);
+    assert_eq!(ident1.time_modified, ident2.time_modified);
+}

omicron-nexus/tests/common/mod.rs

@@ -7,7 +7,6 @@ use dropshot::test_util::LogContext;
 use dropshot::ConfigDropshot;
 use dropshot::ConfigLogging;
 use dropshot::ConfigLoggingLevel;
-use omicron_common::api::external::IdentityMetadata;
 use omicron_common::api::internal::nexus::ProducerEndpoint;
 use omicron_common::dev;
 use slog::o;
@@ -263,12 +262,3 @@ pub async fn start_producer_server(
         .map_err(|e| e.to_string())?;
     Ok(server)
 }
-
-/** Returns whether the two identity metadata objects are identical. */
-pub fn identity_eq(ident1: &IdentityMetadata, ident2: &IdentityMetadata) {
-    assert_eq!(ident1.id, ident2.id);
-    assert_eq!(ident1.name, ident2.name);
-    assert_eq!(ident1.description, ident2.description);
-    assert_eq!(ident1.time_created, ident2.time_created);
-    assert_eq!(ident1.time_modified, ident2.time_modified);
-}

omicron-nexus/tests/test_disks.rs

@@ -28,12 +28,10 @@ use dropshot::test_util::read_json;
 use dropshot::test_util::ClientTestContext;
 
 pub mod common;
-use common::identity_eq;
 use common::resource_helpers::create_project;
 use common::test_setup;
-
-#[macro_use]
-extern crate slog;
+pub mod api_common;
+use api_common::identity_eq;
 
 /*
  * TODO-cleanup the mess of URLs used here and in test_instances.rs ought to

omicron-nexus/tests/test_instances.rs

@@ -25,12 +25,10 @@ use dropshot::test_util::read_json;
 use dropshot::test_util::ClientTestContext;
 
 pub mod common;
-use common::identity_eq;
 use common::resource_helpers::create_project;
 use common::test_setup;
-
-#[macro_use]
-extern crate slog;
+pub mod api_common;
+use api_common::identity_eq;
 
 #[tokio::test]
 async fn test_instances() {

omicron-nexus/tests/test_vpcs.rs

@@ -11,11 +11,12 @@ use dropshot::test_util::objects_list_page;
 use dropshot::test_util::ClientTestContext;
 
 pub mod common;
-use common::identity_eq;
 use common::resource_helpers::{
     create_project, create_vpc, create_vpc_with_error,
 };
 use common::test_setup;
+pub mod api_common;
+use api_common::identity_eq;
 
 extern crate slog;