From 91f3e457abc8f3b102bb33683c05977af630e33d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 24 Apr 2024 10:09:42 +0100
Subject: [PATCH] Tests: Add test case for config.toml -> config

---
 tests/testsuite/config.rs | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs
index c3b2391ad..768c144e9 100644
--- a/tests/testsuite/config.rs
+++ b/tests/testsuite/config.rs
@@ -195,6 +195,18 @@ fn make_config_symlink_to_config_toml_relative() {
     t!(symlink_file(Path::new("config.toml"), &symlink_path));
 }
 
+fn rename_config_toml_to_config_replacing_with_symlink() {
+    let root = paths::root();
+    t!(fs::rename(
+        root.join(".cargo/config.toml"),
+        root.join(".cargo/config")
+    ));
+    t!(symlink_file(
+        Path::new("config"),
+        &root.join(".cargo/config.toml")
+    ));
+}
+
 #[track_caller]
 pub fn assert_error<E: Borrow<anyhow::Error>>(error: E, msgs: &str) {
     let causes = error
@@ -344,6 +356,36 @@ f1 = 1
     assert_match(expected, &output);
 }
 
+#[cargo_test]
+fn config_ambiguous_filename_symlink_doesnt_warn_backward() {
+    // Windows requires special permissions to create symlinks.
+    // If we don't have permission, just skip this test.
+    if !symlink_supported() {
+        return;
+    };
+
+    write_config_toml(
+        "\
+[foo]
+f1 = 1
+",
+    );
+
+    rename_config_toml_to_config_replacing_with_symlink();
+
+    let gctx = new_gctx();
+
+    assert_eq!(gctx.get::<Option<i32>>("foo.f1").unwrap(), Some(1));
+
+    // It should NOT have warned for this situation.
+    // But, currently it does!
+    let output = read_output(gctx);
+    let expected = "\
+[WARNING] both `[..]/.cargo/config` and `[..]/.cargo/config.toml` exist. Using `[..]/.cargo/config`
+";
+    assert_match(expected, &output);
+}
+
 #[cargo_test]
 fn config_ambiguous_filename() {
     write_config_extless(