Skip to content

Commit 4b6da86

Browse files
committed
fix test fallout from dependency bumps
1 parent e15c3b5 commit 4b6da86

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

dev-tools/ls-apis/tests/api_dependencies.out

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Downstairs Controller (debugging only) (client: dsc-client)
4949

5050
Management Gateway Service (client: gateway-client)
5151
consumed by: dpd (dendrite/dpd) via 1 path
52+
consumed by: lldpd (lldp/lldpd) via 1 path
5253
consumed by: mgd (maghemite/mgd) via 1 path
5354
consumed by: omicron-nexus (omicron/nexus) via 4 paths
5455
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path

dev-tools/omdb/tests/env.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ termination: Exited(2)
1717
stdout:
1818
---------------------------------------------
1919
stderr:
20-
error: invalid value 'junk' for '--db-url <DB_URL>': invalid connection string: unexpected EOF
20+
error: invalid value 'junk' for '--db-url <DB_URL>': invalid connection string
2121

2222
For more information, try '--help'.
2323
=============================================

nexus-config/src/postgres_config.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,17 @@ mod test {
111111
// tokio_postgres::config::Config parser to include in the error
112112
// message.
113113
let error = "foo".parse::<PostgresConfigWithUrl>().unwrap_err();
114-
assert!(error.to_string().contains("unexpected EOF"));
114+
assert!(
115+
error.to_string().contains("invalid connection string"),
116+
"'{error}' does not contain 'invalid connection string'"
117+
);
115118
"http://127.0.0.1:1234".parse::<PostgresConfigWithUrl>().unwrap_err();
116119
let error = "postgresql://example.com?sslmode=not-a-real-ssl-mode"
117120
.parse::<PostgresConfigWithUrl>()
118121
.unwrap_err();
119122
assert!(
120-
error.to_string().contains("invalid value for option `sslmode`")
123+
error.to_string().contains("invalid connection string"),
124+
"'{error}' does not contain 'invalid connection string'"
121125
);
122126
}
123127

0 commit comments

Comments
 (0)