Fix for testsuite

Author: chaaz

tests/testsuite/sync_lockfile.rs

@@ -1,135 +1,28 @@
 //! Tests for the `cargo sync-lockfile` command.
 
-use cargo_test_support::registry::Package;
-use cargo_test_support::rustc_host;
-use cargo_test_support::{basic_manifest, cross_compile, project};
+use cargo_test_support::project;
 
 #[cargo_test]
-fn no_deps() {
-    let p = project()
-        .file("src/main.rs", "mod a; fn main() {}")
-        .file("src/a.rs", "")
-        .build();
-
-    p.cargo("sync-lockfile").with_stdout("").run();
-}
-
-#[cargo_test]
-fn sync_all_platform_dependencies_when_no_target_is_given() {
-    if cross_compile::disabled() {
-        return;
-    }
-
-    Package::new("d1", "1.2.3")
-        .file("Cargo.toml", &basic_manifest("d1", "1.2.3"))
-        .file("src/lib.rs", "")
-        .publish();
-
-    Package::new("d2", "0.1.2")
-        .file("Cargo.toml", &basic_manifest("d2", "0.1.2"))
-        .file("src/lib.rs", "")
-        .publish();
-
-    let target = cross_compile::alternate();
-    let host = rustc_host();
-    let p = project()
-        .file(
-            "Cargo.toml",
-            &format!(
-                r#"
+fn sync_after_generate() {
+    let p = project().file("src/main.rs", "fn main() {}").build();
+    p.cargo("generate-lockfile").run();
+    let lock1 = p.read_lockfile();
+
+    // add a dep
+    p.change_file(
+        "Cargo.toml",
+        r#"
             [package]
             name = "foo"
-            version = "0.0.1"
             authors = []
-
-            [target.{host}.dependencies]
-            d1 = "1.2.3"
-
-            [target.{target}.dependencies]
-            d2 = "0.1.2"
+            version = "0.0.2"
         "#,
-                host = host,
-                target = target
-            ),
-        )
-        .file("src/lib.rs", "")
-        .build();
-
-    p.cargo("sync-lockfile")
-        .with_stderr_contains("[DOWNLOADED] d1 v1.2.3 [..]")
-        .with_stderr_contains("[DOWNLOADED] d2 v0.1.2 [..]")
-        .run();
-}
-
-#[cargo_test]
-fn sync_platform_specific_dependencies() {
-    if cross_compile::disabled() {
-        return;
-    }
-
-    Package::new("d1", "1.2.3")
-        .file("Cargo.toml", &basic_manifest("d1", "1.2.3"))
-        .file("src/lib.rs", "")
-        .publish();
-
-    Package::new("d2", "0.1.2")
-        .file("Cargo.toml", &basic_manifest("d2", "0.1.2"))
-        .file("src/lib.rs", "")
-        .publish();
-
-    let target = cross_compile::alternate();
-    let host = rustc_host();
-    let p = project()
-        .file(
-            "Cargo.toml",
-            &format!(
-                r#"
-            [package]
-            name = "foo"
-            version = "0.0.1"
-            authors = []
-
-            [target.{host}.dependencies]
-            d1 = "1.2.3"
-
-            [target.{target}.dependencies]
-            d2 = "0.1.2"
-        "#,
-                host = host,
-                target = target
-            ),
-        )
-        .file("src/lib.rs", "")
-        .build();
-
-    p.cargo("sync-lockfile --target")
-        .arg(&host)
-        .with_stderr_contains("[DOWNLOADED] d1 v1.2.3 [..]")
-        .with_stderr_does_not_contain("[DOWNLOADED] d2 v0.1.2 [..]")
-        .run();
-
-    p.cargo("sync-lockfile --target")
-        .arg(&target)
-        .with_stderr_contains("[DOWNLOADED] d2 v0.1.2[..]")
-        .with_stderr_does_not_contain("[DOWNLOADED] d1 v1.2.3 [..]")
-        .run();
-}
-
-#[cargo_test]
-fn sync_warning() {
-    let p = project()
-        .file(
-            "Cargo.toml",
-            r#"
-            [package]
-            name = "foo"
-            version = "1.0.0"
-            misspelled = "wut"
-            "#,
-        )
-        .file("src/lib.rs", "")
-        .build();
-    p.cargo("sync-lockfile")
-        .with_stderr("[WARNING] unused manifest key: package.misspelled")
-        .run();
+    );
+    p.cargo("sync-lockfile").run();
+    let lock2 = p.read_lockfile();
+    assert_ne!(lock1, lock2);
+    assert!(lock1.contains("0.0.1"));
+    assert!(lock2.contains("0.0.2"));
+    assert!(!lock1.contains("0.0.2"));
+    assert!(!lock2.contains("0.0.1"));
 }