Skip to content

Commit ef24bb3

Browse files
committed
fix some tests
1 parent d0f4693 commit ef24bb3

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

dev-tools/omdb/tests/env.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ note: using Nexus URL junk
183183
Error: listing background tasks
184184

185185
Caused by:
186-
0: Communication Error: builder error: relative URL without a base
187-
1: builder error: relative URL without a base
186+
0: Communication Error: builder error
187+
1: builder error
188188
2: relative URL without a base
189189
=============================================
190190
EXECUTING COMMAND: omdb ["nexus", "background-tasks", "doc"]
@@ -549,8 +549,8 @@ note: using Oximeter URL junk
549549
Error: failed to fetch collector info
550550

551551
Caused by:
552-
0: Communication Error: builder error: relative URL without a base
553-
1: builder error: relative URL without a base
552+
0: Communication Error: builder error
553+
1: builder error
554554
2: relative URL without a base
555555
=============================================
556556
EXECUTING COMMAND: omdb ["oxql", "--clickhouse-url", "junk"]

internal-dns/src/resolver.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,8 @@ mod test {
833833
// The DNS server is running, but has no records. Expect a failure.
834834
let err = client.test_endpoint().await.unwrap_err();
835835
assert!(
836-
err.to_string().contains("no record found"),
837-
"Unexpected Error (expected 'no record found'): {err}",
836+
err.to_string().contains("error sending request"),
837+
"Unexpected Error (expected 'error sending request'): {err}",
838838
);
839839

840840
// Add a record for the new service.
@@ -913,8 +913,8 @@ mod test {
913913
// The DNS server is running, but has no records. Expect a failure.
914914
let err = client.test_endpoint().await.unwrap_err();
915915
assert!(
916-
err.to_string().contains("no record found"),
917-
"Unexpected Error (expected 'no record found'): {err}",
916+
err.to_string().contains("error sending request"),
917+
"Unexpected Error (expected 'error sending request'): {err}",
918918
);
919919

920920
// Add a record for the new service, but only to the second DNS server.

nexus/tests/integration_tests/certificates.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,9 @@ async fn test_silo_certificates() {
602602
assert!(
603603
error.to_string().contains("invalid peer certificate")
604604
|| error.to_string().contains("self-signed certificate")
605-
|| error.to_string().contains("self signed certificate")
605+
|| error.to_string().contains("self signed certificate"),
606+
"Unexpected error: {}",
607+
error,
606608
);
607609
} else {
608610
panic!(

0 commit comments

Comments
 (0)