Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions omicron-nexus/tests/test_disks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ use common::identity_eq;
use common::resource_helpers::create_project;
use common::test_setup;

#[macro_use]
extern crate slog;

/*
* TODO-cleanup the mess of URLs used here and in test_instances.rs ought to
* come from common code.
Expand Down
3 changes: 0 additions & 3 deletions omicron-nexus/tests/test_instances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ use common::identity_eq;
use common::resource_helpers::create_project;
use common::test_setup;

#[macro_use]
extern crate slog;

#[tokio::test]
async fn test_instances() {
let cptestctx = test_setup("test_instances").await;
Expand Down
2 changes: 1 addition & 1 deletion omicron-nexus/tests/test_oximeter.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Integration tests for oximeter collectors and producers.
mod common;
pub mod common;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for this change is similar to what's described in rust-lang/rust#46379: some tests that use mod common use identity_eq function, but this one doesn't. So when Cargo builds this test, it reports a dead_code warning on identity_eq. Every other test file works around this kind of problem using pub mod common. Other solutions are possible (e.g., put identity_eq into a separate module that's only included where needed), but for now I'm doing the simple thing that's consistent with the other tests.


use uuid::Uuid;

Expand Down