test: migrate net_config to snapbox

rust-lang · Jun 28, 2024 · 2055e5d · 2055e5d
1 parent ea171f6
commit 2055e5d
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/tests/testsuite/net_config.rs b/tests/testsuite/net_config.rs
@@ -1,8 +1,7 @@
 //! Tests for network configuration.
 
-#![allow(deprecated)]
-
 use cargo_test_support::project;
+use cargo_test_support::str;
 
 #[cargo_test]
 fn net_retry_loads_from_config() {
@@ -33,10 +32,11 @@ fn net_retry_loads_from_config() {
 
     p.cargo("check -v")
         .with_status(101)
-        .with_stderr_contains(
-            "[WARNING] spurious network error \
-             (1 tries remaining): [..]",
-        )
+        .with_stderr_data(str![[r#"
+...
+[WARNING] spurious network error (1 tries remaining): [7] Couldn't connect to server (Failed to connect to 127.0.0.1 port 11 after [..] ms: Couldn't connect to server)[..]
+...
+"#]])
         .run();
 }
 
@@ -67,10 +67,11 @@ fn net_retry_git_outputs_warning() {
 
     p.cargo("check -v -j 1")
         .with_status(101)
-        .with_stderr_contains(
-            "[WARNING] spurious network error \
-             (2 tries remaining): [..]",
-        )
-        .with_stderr_contains("[WARNING] spurious network error (1 tries remaining): [..]")
+        .with_stderr_data(str![[r#"
+...
+[WARNING] spurious network error (2 tries remaining): [7] Couldn't connect to server (Failed to connect to 127.0.0.1 port 11 after [..] ms: Couldn't connect to server)[..]
+[WARNING] spurious network error (1 tries remaining): [7] Couldn't connect to server (Failed to connect to 127.0.0.1 port 11 after [..] ms: Couldn't connect to server)[..]
+...
+"#]])
         .run();
 }