fix test workaround for localhost IPs

oxidecomputer · Aug 6, 2024 · 9c335e3 · 9c335e3
1 parent 0f67712
commit 9c335e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/nexus/db-queries/src/db/datastore/deployment/external_networking.rs b/nexus/db-queries/src/db/datastore/deployment/external_networking.rs
@@ -135,7 +135,9 @@ impl DataStore {
         // the normal path because normally a given external IP must only be
         // used once.  Just treat localhost in the test suite as though it's
         // already allocated.  We do the same in is_nic_already_allocated().
-        if cfg!(test) && external_ip.ip().is_loopback() {
+        if cfg!(any(test, feature = "testing"))
+            && external_ip.ip().is_loopback()
+        {
             return Ok(true);
         }
 
@@ -206,7 +208,7 @@ impl DataStore {
         log: &Logger,
     ) -> Result<bool, Error> {
         // See the comment in is_external_ip_already_allocated().
-        if cfg!(test) && nic.ip.is_loopback() {
+        if cfg!(any(test, feature = "testing")) && nic.ip.is_loopback() {
             return Ok(true);
         }
 

diff --git a/nexus/reconfigurator/execution/Cargo.toml b/nexus/reconfigurator/execution/Cargo.toml
@@ -43,6 +43,7 @@ async-bb8-diesel.workspace = true
 diesel.workspace = true
 httptest.workspace = true
 ipnet.workspace = true
+nexus-db-queries = { workspace = true, features = ["testing"] }
 nexus-reconfigurator-planning.workspace = true
 nexus-reconfigurator-preparation.workspace = true
 nexus-inventory.workspace = true