Merge pull request rust-lang#81 from alexcrichton/no-local-fix

Fix tests if `cargo fix` is already installed
ehuss · May 4, 2018 · 9f8d2d1 · 9f8d2d1
2 parents 18f0217 + cab6296
commit 9f8d2d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cargo-fix/tests/all/dependencies.rs b/cargo-fix/tests/all/dependencies.rs
@@ -51,7 +51,7 @@ fn fix_path_deps() {
 [CHECKING] foo v0.1.0 (CWD)
 [FINISHED] dev [unoptimized + debuginfo]
 ";
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .stdout("")
         .stderr(stderr)
         .run();
@@ -93,7 +93,7 @@ fn do_not_fix_non_relevant_deps() {
         "#)
         .build();
 
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .cwd("foo")
         .status(101)
         .run();

diff --git a/cargo-fix/tests/all/smoke.rs b/cargo-fix/tests/all/smoke.rs
@@ -10,7 +10,7 @@ fn no_changes_necessary() {
 [CHECKING] foo v0.1.0 (CWD)
 [FINISHED] dev [unoptimized + debuginfo]
 ";
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .stdout("")
         .stderr(stderr)
         .run();
@@ -34,7 +34,7 @@ fn fixes_missing_ampersand() {
 [CHECKING] foo v0.1.0 (CWD)
 [FINISHED] dev [unoptimized + debuginfo]
 ";
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .stdout("")
         .stderr(stderr)
         .run();
@@ -58,7 +58,7 @@ fn fixes_two_missing_ampersands() {
 [CHECKING] foo v0.1.0 (CWD)
 [FINISHED] dev [unoptimized + debuginfo]
 ";
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .stdout("")
         .stderr(stderr)
         .run();
@@ -82,7 +82,7 @@ fn tricky_ampersand() {
 [CHECKING] foo v0.1.0 (CWD)
 [FINISHED] dev [unoptimized + debuginfo]
 ";
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .stdout("")
         .stderr(stderr)
         .run();
@@ -97,7 +97,7 @@ fn preserve_line_endings() {
         ")
         .build();
 
-    p.expect_cmd("cargo fix").run();
+    p.expect_cmd("cargo-fix fix").run();
     assert!(p.read("src/lib.rs").contains("\r\n"));
 }
 
@@ -123,7 +123,7 @@ error: Could not compile `foo`.
 To learn more, run the command again with --verbose.
 ";
 
-    p.expect_cmd("cargo fix")
+    p.expect_cmd("cargo-fix fix")
         .stderr(stderr)
         .status(101)
         .run();