1 files changed, 100 insertions, 31 deletions
diff --git a/src/tools/cargo/tests/testsuite/pkgid.rs b/src/tools/cargo/tests/testsuite/pkgid.rs
index 3e3e4692a..88d991e80 100644
--- a/src/tools/cargo/tests/testsuite/pkgid.rs
+++ b/src/tools/cargo/tests/testsuite/pkgid.rs
@@ -4,22 +4,31 @@ use cargo_test_support::project;
 use cargo_test_support::registry::Package;
 
 #[cargo_test]
-fn simple() {
-    Package::new("bar", "0.1.0").publish();
+fn local() {
     let p = project()
         .file(
             "Cargo.toml",
             r#"
+                [workspace]
+                members = ["bar"]
+
                 [package]
                 name = "foo"
                 version = "0.1.0"
                 edition = "2018"
-
-                [dependencies]
-                bar = "0.1.0"
             "#,
         )
         .file("src/main.rs", "fn main() {}")
+        .file(
+            "bar/Cargo.toml",
+            r#"
+                [package]
+                name = "bar"
+                version = "0.1.0"
+                edition = "2018"
+            "#,
+        )
+        .file("bar/src/main.rs", "fn main() {}")
         .build();
 
     p.cargo("generate-lockfile").run();
@@ -28,16 +37,38 @@ fn simple() {
         .with_stdout(format!("file://[..]{}#0.1.0", p.root().to_str().unwrap()))
         .run();
 
-    p.cargo("pkgid bar")
-        .with_stdout("https://github.com/rust-lang/crates.io-index#bar@0.1.0")
+    // Bad file URL.
+    p.cargo("pkgid ./Cargo.toml")
+        .with_status(101)
+        .with_stderr(
+            "\
+error: invalid package ID specification: `./Cargo.toml`
+
+Caused by:
+  package ID specification `./Cargo.toml` looks like a file path, maybe try file://[..]/Cargo.toml
+",
+        )
+        .run();
+
+    // Bad file URL with similar name.
+    p.cargo("pkgid './bar'")
+        .with_status(101)
+        .with_stderr(
+            "\
+error: invalid package ID specification: `./bar`
+
+<tab>Did you mean `bar`?
+
+Caused by:
+  package ID specification `./bar` looks like a file path, maybe try file://[..]/bar
+",
+        )
         .run();
 }
 
 #[cargo_test]
-fn suggestion_bad_pkgid() {
+fn registry() {
     Package::new("crates-io", "0.1.0").publish();
-    Package::new("two-ver", "0.1.0").publish();
-    Package::new("two-ver", "0.2.0").publish();
     let p = project()
         .file(
             "Cargo.toml",
@@ -49,16 +80,18 @@ fn suggestion_bad_pkgid() {
 
                 [dependencies]
                 crates-io = "0.1.0"
-                two-ver = "0.1.0"
-                two-ver2 = { package = "two-ver", version = "0.2.0" }
             "#,
         )
-        .file("src/lib.rs", "")
+        .file("src/main.rs", "fn main() {}")
         .file("cratesio", "")
         .build();
 
     p.cargo("generate-lockfile").run();
 
+    p.cargo("pkgid crates-io")
+        .with_stdout("https://github.com/rust-lang/crates.io-index#crates-io@0.1.0")
+        .run();
+
     // Bad URL.
     p.cargo("pkgid https://example.com/crates-io")
         .with_status(101)
@@ -83,45 +116,81 @@ error: package ID specification `crates_io` did not match any packages
 ",
         )
         .run();
+}
 
-    // Bad version.
-    p.cargo("pkgid two-ver:0.3.0")
+#[cargo_test]
+fn multiple_versions() {
+    Package::new("two-ver", "0.1.0").publish();
+    Package::new("two-ver", "0.2.0").publish();
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.1.0"
+                edition = "2018"
+
+                [dependencies]
+                two-ver = "0.1.0"
+                two-ver2 = { package = "two-ver", version = "0.2.0" }
+            "#,
+        )
+        .file("src/lib.rs", "")
+        .file("cratesio", "")
+        .build();
+
+    p.cargo("generate-lockfile").run();
+
+    p.cargo("pkgid two-ver:0.2.0")
+        .with_stdout("https://github.com/rust-lang/crates.io-index#two-ver@0.2.0")
+        .run();
+
+    // Incomplete version.
+    p.cargo("pkgid two-ver@0")
         .with_status(101)
         .with_stderr(
             "\
-error: package ID specification `two-ver@0.3.0` did not match any packages
-Did you mean one of these?
-
+error: There are multiple `two-ver` packages in your project, and the specification `two-ver@0` is ambiguous.
+Please re-run this command with one of the following specifications:
   two-ver@0.1.0
   two-ver@0.2.0
 ",
         )
         .run();
 
-    // Bad file URL.
-    p.cargo("pkgid ./Cargo.toml")
+    // Incomplete version.
+    p.cargo("pkgid two-ver@0.2")
+        .with_stdout(
+            "\
+https://github.com/rust-lang/crates.io-index#two-ver@0.2.0
+",
+        )
+        .run();
+
+    // Ambiguous.
+    p.cargo("pkgid two-ver")
         .with_status(101)
         .with_stderr(
             "\
-error: invalid package ID specification: `./Cargo.toml`
-
-Caused by:
-  package ID specification `./Cargo.toml` looks like a file path, maybe try file://[..]/Cargo.toml
+error: There are multiple `two-ver` packages in your project, and the specification `two-ver` is ambiguous.
+Please re-run this command with one of the following specifications:
+  two-ver@0.1.0
+  two-ver@0.2.0
 ",
         )
         .run();
 
-    // Bad file URL with similar name.
-    p.cargo("pkgid './cratesio'")
+    // Bad version.
+    p.cargo("pkgid two-ver:0.3.0")
         .with_status(101)
         .with_stderr(
             "\
-error: invalid package ID specification: `./cratesio`
-
-<tab>Did you mean `crates-io`?
+error: package ID specification `two-ver@0.3.0` did not match any packages
+Did you mean one of these?
 
-Caused by:
-  package ID specification `./cratesio` looks like a file path, maybe try file://[..]/cratesio
+  two-ver@0.1.0
+  two-ver@0.2.0
 ",
         )
         .run();