test: Adjust update-breaking tests.

Author: torhovland

tests/testsuite/update.rs

@@ -362,7 +362,7 @@ fn change_package_version() {
 }
 
 #[cargo_test]
-fn update_precise() {
+fn update_precise_downgrade() {
     Package::new("serde", "0.1.0").publish();
     Package::new("serde", "0.2.1").publish();
 
@@ -1411,7 +1411,7 @@ fn update_precise_git_revisions() {
 }
 
 #[cargo_test]
-fn precise_yanked() {
+fn update_precise_yanked() {
     Package::new("bar", "0.1.0").publish();
     Package::new("bar", "0.1.1").yanked(true).publish();
     let p = project()
@@ -1450,7 +1450,7 @@ fn precise_yanked() {
 }
 
 #[cargo_test]
-fn precise_yanked_multiple_presence() {
+fn update_precise_yanked_multiple_presence() {
     Package::new("bar", "0.1.0").publish();
     Package::new("bar", "0.1.1").yanked(true).publish();
     let p = project()
@@ -1631,8 +1631,8 @@ fn update_breaking_unstable() {
         .file("src/lib.rs", "")
         .build();
 
-    p.cargo("update --breaking")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+    p.cargo("update --breaking") 
+        .masquerade_as_nightly_cargo(&[])
         .with_status(101)
         .with_stderr_data(str![[r#"
 [ERROR] the `--breaking` flag is unstable, pass `-Z unstable-options` to enable it
@@ -1687,7 +1687,7 @@ fn update_breaking_dry_run() {
     Package::new("ws", "2.0.0").publish();
 
     p.cargo("update -Zunstable-options --dry-run --breaking")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `dummy-registry` index
 [UPGRADING] incompatible ^1.0 -> ^2.0
@@ -1886,7 +1886,7 @@ fn update_breaking() {
     Package::new("build", "2.0.0").publish();
 
     p.cargo("update -Zunstable-options --breaking")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `alternative` index
 [UPGRADING] multiple-registries ^2.0 -> ^3.0
@@ -2096,7 +2096,7 @@ fn update_breaking_specific_packages() {
     Package::new("transitive-incompatible", "2.0.0").publish();
 
     p.cargo("update -Zunstable-options --breaking just-foo shared ws")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `dummy-registry` index
 [UPGRADING] shared ^1.0 -> ^2.0
@@ -2160,7 +2160,7 @@ fn update_breaking_specific_packages_that_wont_update() {
     Package::new("transitive-incompatible", "2.0.0").publish();
 
     p.cargo("update -Zunstable-options --breaking compatible renamed-from non-semver transitive-compatible transitive-incompatible")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 
@@ -2218,7 +2218,7 @@ fn update_breaking_without_lock_file() {
     Package::new("incompatible", "2.0.0").publish();
 
     p.cargo("update -Zunstable-options --breaking")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 [UPGRADING] incompatible ^1.0 -> ^2.0
@@ -2260,7 +2260,7 @@ fn update_breaking_spec_version() {
 
     // Invalid spec
     p.cargo("update -Zunstable-options --breaking incompatible@foo")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_status(101)
         .with_stderr_data(str![[r#"
 [ERROR] expected a version like "1.32"
@@ -2270,19 +2270,19 @@ fn update_breaking_spec_version() {
 
     // Spec version not matching our current dependencies
     p.cargo("update -Zunstable-options --breaking [email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
         .with_stderr_data(str![[r#""#]])
+        .masquerade_as_nightly_cargo(&[])
         .run();
 
     // Spec source not matching our current dependencies
     p.cargo("update -Zunstable-options --breaking https://alternative.com#[email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
         .with_stderr_data(str![[r#""#]])
+        .masquerade_as_nightly_cargo(&[])
         .run();
 
     // Accepted spec
     p.cargo("update -Zunstable-options --breaking [email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 [UPGRADING] incompatible ^1.0 -> ^2.0
@@ -2295,7 +2295,7 @@ fn update_breaking_spec_version() {
     // Accepted spec, full format
     Package::new("incompatible", "3.0.0").publish();
     p.cargo("update -Zunstable-options --breaking https://github.com/rust-lang/crates.io-index#[email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 [UPGRADING] incompatible ^2.0 -> ^3.0
@@ -2307,7 +2307,7 @@ fn update_breaking_spec_version() {
 
     // Spec matches a dependency that will not be upgraded
     p.cargo("update -Zunstable-options --breaking [email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 
@@ -2316,20 +2316,20 @@ fn update_breaking_spec_version() {
 
     // Non-existing versions
     p.cargo("update -Zunstable-options --breaking [email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
         .with_stderr_data(str![[r#""#]])
+        .masquerade_as_nightly_cargo(&[])
         .run();
 
     p.cargo("update -Zunstable-options --breaking [email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
         .with_stderr_data(str![[r#""#]])
+        .masquerade_as_nightly_cargo(&[])
         .run();
 }
 
 #[cargo_test]
 fn update_breaking_spec_version_transitive() {
     Package::new("dep", "1.0.0").publish();
-    Package::new("dep", "1.1.0").publish();
+    Package::new("dep", "2.0.0").publish();
 
     let p = project()
         .file(
@@ -2357,44 +2357,44 @@ fn update_breaking_spec_version_transitive() {
                 authors  =  []
 
                 [dependencies]
-                dep  =  "1.1"
+                dep  =  "2.0"
             "#,
         )
         .file("bar/src/lib.rs", "")
         .build();
 
     p.cargo("generate-lockfile").run();
 
-    Package::new("dep", "1.1.1").publish();
-    Package::new("dep", "2.0.0").publish();
+    Package::new("dep", "2.0.1").publish();
+    Package::new("dep", "3.0.0").publish();
 
     // Will upgrade the direct dependency
     p.cargo("update -Zunstable-options --breaking [email protected]")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
-[UPGRADING] dep ^1.0 -> ^2.0
+[UPGRADING] dep ^1.0 -> ^3.0
 [LOCKING] 1 package to latest compatible version
-[ADDING] dep v2.0.0
+[UPDATING] dep v1.0.0 -> v3.0.0
 
 "#]])
         .run();
 
     // But not the transitive one, because bar is not a workspace member
-    p.cargo("update -Zunstable-options --breaking dep@1.1")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+    p.cargo("update -Zunstable-options --breaking dep@2.0")
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 
 "#]])
         .run();
 
     // A non-breaking update is different, as it will update transitive dependencies
-    p.cargo("update dep@1.1")
+    p.cargo("update dep@2.0")
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 [LOCKING] 1 package to latest compatible version
-[UPDATING] dep v1.1.0 -> v1.1.1 (latest: v2.0.0)
+[UPDATING] dep v2.0.0 -> v2.0.1 (latest: v3.0.0)
 
 "#]])
         .run();
@@ -2448,7 +2448,7 @@ fn update_breaking_mixed_compatibility() {
     Package::new("mixed-compatibility", "2.0.1").publish();
 
     p.cargo("update -Zunstable-options --breaking")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 [UPGRADING] mixed-compatibility ^1.0 -> ^2.0
@@ -2534,7 +2534,7 @@ fn update_breaking_mixed_pinning_renaming() {
     Package::new("renamed-from", "2.0.0").publish();
 
     p.cargo("update -Zunstable-options --breaking")
-        .masquerade_as_nightly_cargo(&["update-breaking"])
+        .masquerade_as_nightly_cargo(&[])
         .with_stderr_data(str![[r#"
 [UPDATING] `[..]` index
 [UPGRADING] mixed-pinned ^1.0 -> ^2.0