fix some tests

oxidecomputer · Sep 15, 2024 · 1e9f5a7 · 1e9f5a7
1 parent d0f4693
commit 1e9f5a7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/dev-tools/omdb/tests/env.out b/dev-tools/omdb/tests/env.out
@@ -183,8 +183,8 @@ note: using Nexus URL junk
 Error: listing background tasks
 
 Caused by:
-    0: Communication Error: builder error: relative URL without a base
-    1: builder error: relative URL without a base
+    0: Communication Error: builder error
+    1: builder error
     2: relative URL without a base
 =============================================
 EXECUTING COMMAND: omdb ["nexus", "background-tasks", "doc"]
@@ -549,8 +549,8 @@ note: using Oximeter URL junk
 Error: failed to fetch collector info
 
 Caused by:
-    0: Communication Error: builder error: relative URL without a base
-    1: builder error: relative URL without a base
+    0: Communication Error: builder error
+    1: builder error
     2: relative URL without a base
 =============================================
 EXECUTING COMMAND: omdb ["oxql", "--clickhouse-url", "junk"]

diff --git a/internal-dns/src/resolver.rs b/internal-dns/src/resolver.rs
@@ -833,8 +833,8 @@ mod test {
         // The DNS server is running, but has no records. Expect a failure.
         let err = client.test_endpoint().await.unwrap_err();
         assert!(
-            err.to_string().contains("no record found"),
-            "Unexpected Error (expected 'no record found'): {err}",
+            err.to_string().contains("error sending request"),
+            "Unexpected Error (expected 'error sending request'): {err}",
         );
 
         // Add a record for the new service.
@@ -913,8 +913,8 @@ mod test {
         // The DNS server is running, but has no records. Expect a failure.
         let err = client.test_endpoint().await.unwrap_err();
         assert!(
-            err.to_string().contains("no record found"),
-            "Unexpected Error (expected 'no record found'): {err}",
+            err.to_string().contains("error sending request"),
+            "Unexpected Error (expected 'error sending request'): {err}",
         );
 
         // Add a record for the new service, but only to the second DNS server.

diff --git a/nexus/tests/integration_tests/certificates.rs b/nexus/tests/integration_tests/certificates.rs
@@ -602,7 +602,9 @@ async fn test_silo_certificates() {
         assert!(
             error.to_string().contains("invalid peer certificate")
                 || error.to_string().contains("self-signed certificate")
-                || error.to_string().contains("self signed certificate")
+                || error.to_string().contains("self signed certificate"),
+            "Unexpected error: {}",
+            error.to_string(),
         );
     } else {
         panic!(