Merging upstream version 1.70.0+dfsg2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 74 insertions, 0 deletions

diff --git a/src/tools/cargo/tests/testsuite/net_config.rs b/src/tools/cargo/tests/testsuite/net_config.rs
new file mode 100644
index 000000000..569ec552c
--- /dev/null
+++ b/src/tools/cargo/tests/testsuite/net_config.rs
@@ -0,0 +1,74 @@
+//! Tests for network configuration.
+
+use cargo_test_support::project;
+
+#[cargo_test]
+fn net_retry_loads_from_config() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.0.1"
+                authors = []
+
+                [dependencies.bar]
+                git = "http://127.0.0.1:11/foo/bar"
+            "#,
+        )
+        .file("src/main.rs", "")
+        .file(
+            ".cargo/config",
+            r#"
+           [net]
+           retry=1
+           [http]
+           timeout=1
+            "#,
+        )
+        .build();
+
+    p.cargo("check -v")
+        .with_status(101)
+        .with_stderr_contains(
+            "[WARNING] spurious network error \
+             (1 tries remaining): [..]",
+        )
+        .run();
+}
+
+#[cargo_test]
+fn net_retry_git_outputs_warning() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.0.1"
+                authors = []
+
+                [dependencies.bar]
+                git = "http://127.0.0.1:11/foo/bar"
+            "#,
+        )
+        .file(
+            ".cargo/config",
+            r#"
+           [http]
+           timeout=1
+            "#,
+        )
+        .file("src/main.rs", "")
+        .build();
+
+    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): [..]")
+        .run();
+}