Merge remote-tracking branch 'origin/main' into john/remove-omicron-z…

…one-config-ip
oxidecomputer · Oct 18, 2024 · 6b6a993 · 6b6a993
2 parents 6c51121 + 7b3dd55
commit 6b6a993
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@42f4ec8e42bf7fe4dadd39bfc534566095a8edff # v2
+        uses: taiki-e/install-action@3e1dd227d968fb9fa43ff604bd9b0ccd1b714919 # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -624,7 +624,7 @@ update-engine = { path = "update-engine" }
 url = "2.5.2"
 usdt = "0.5.0"
 uuid = { version = "1.10.0", features = ["serde", "v4"] }
-uzers = "0.11"
+uzers = "0.12"
 walkdir = "2.5"
 whoami = "1.5"
 wicket = { path = "wicket" }

diff --git a/gateway-test-utils/src/setup.rs b/gateway-test-utils/src/setup.rs
@@ -197,7 +197,11 @@ pub async fn test_setup_with_config(
             future::ready(result)
         },
         &Duration::from_millis(100),
-        &Duration::from_secs(1),
+        // This seems like a pretty long time to wait for MGS to discover the
+        // simulated SPs, but we've seen tests fail due to timeouts here in the
+        // past, so we may as well be generous:
+        // https://github.com/oxidecomputer/omicron/issues/6877
+        &Duration::from_secs(30),
     )
     .await
     .unwrap();