From 37df042ba86108e85c18eddccc3e4760f6ba06b6 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 4 Feb 2019 18:52:33 +0100
Subject: [PATCH] Test cleanup: remove unnecessary with_status(0)

---
 tests/testsuite/build.rs      |  2 --
 tests/testsuite/directory.rs  |  1 -
 tests/testsuite/edition.rs    |  5 +----
 tests/testsuite/fix.rs        |  2 --
 tests/testsuite/package.rs    | 10 ++--------
 tests/testsuite/registry.rs   |  1 -
 tests/testsuite/run.rs        | 11 ++---------
 tests/testsuite/workspaces.rs |  2 --
 8 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index bd54ab648..892b7c9e2 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -4628,13 +4628,11 @@ Did you mean `ex1`?",
         .run();
 
     ws.cargo("build -v --lib")
-        .with_status(0)
         .with_stderr_contains("[RUNNING] `rustc [..]a/src/lib.rs[..]")
         .with_stderr_contains("[RUNNING] `rustc [..]b/src/lib.rs[..]")
         .run();
 
     ws.cargo("build -v --example ex1")
-        .with_status(0)
         .with_stderr_contains("[RUNNING] `rustc [..]a/examples/ex1.rs[..]")
         .run();
 }
diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs
index 081e0be0e..217afa290 100644
--- a/tests/testsuite/directory.rs
+++ b/tests/testsuite/directory.rs
@@ -713,7 +713,6 @@ fn workspace_different_locations() {
     p.cargo("build").cwd(p.root().join("foo")).run();
     p.cargo("build")
         .cwd(p.root().join("bar"))
-        .with_status(0)
         .with_stderr(
             "\
 [COMPILING] bar [..]
diff --git a/tests/testsuite/edition.rs b/tests/testsuite/edition.rs
index 5c6e0db36..3652318be 100644
--- a/tests/testsuite/edition.rs
+++ b/tests/testsuite/edition.rs
@@ -32,8 +32,5 @@ fn edition_works_for_build_script() {
         .file("a/src/lib.rs", "pub fn foo() {}")
         .build();
 
-    p.cargo("build -v")
-        .masquerade_as_nightly_cargo()
-        .with_status(0)
-        .run();
+    p.cargo("build -v").masquerade_as_nightly_cargo().run();
 }
diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs
index 0bdcf221d..679abe015 100644
--- a/tests/testsuite/fix.rs
+++ b/tests/testsuite/fix.rs
@@ -943,7 +943,6 @@ fn fix_idioms() {
 ";
     p.cargo("fix --edition-idioms --allow-no-vcs")
         .with_stderr(stderr)
-        .with_status(0)
         .run();
 
     assert!(p.read_file("src/lib.rs").contains("Box<dyn Any>"));
@@ -955,7 +954,6 @@ fn idioms_2015_ok() {
 
     p.cargo("fix --edition-idioms --allow-no-vcs")
         .masquerade_as_nightly_cargo()
-        .with_status(0)
         .run();
 }
 
diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
index fe2e392e9..5ae5903cf 100644
--- a/tests/testsuite/package.rs
+++ b/tests/testsuite/package.rs
@@ -1263,10 +1263,7 @@ fn package_with_select_features() {
         )
         .build();
 
-    p.cargo("package --features required")
-        .masquerade_as_nightly_cargo()
-        .with_status(0)
-        .run();
+    p.cargo("package --features required").masquerade_as_nightly_cargo().run();
 }
 
 #[test]
@@ -1295,10 +1292,7 @@ fn package_with_all_features() {
         )
         .build();
 
-    p.cargo("package --all-features")
-        .masquerade_as_nightly_cargo()
-        .with_status(0)
-        .run();
+    p.cargo("package --all-features").masquerade_as_nightly_cargo().run();
 }
 
 #[test]
diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs
index d56e71410..4330e1dde 100644
--- a/tests/testsuite/registry.rs
+++ b/tests/testsuite/registry.rs
@@ -635,7 +635,6 @@ required by package `foo v0.0.1 ([..])`
         .run();
 
     p.cargo("update -p baz")
-        .with_status(0)
         .with_stderr_contains(
             "\
 [UPDATING] `[..]` index
diff --git a/tests/testsuite/run.rs b/tests/testsuite/run.rs
index 1cd07f079..8a8e3388c 100644
--- a/tests/testsuite/run.rs
+++ b/tests/testsuite/run.rs
@@ -1098,10 +1098,7 @@ fn run_workspace() {
 available binaries: a, b",
         )
         .run();
-    p.cargo("run --bin a")
-        .with_status(0)
-        .with_stdout("run-a")
-        .run();
+    p.cargo("run --bin a").with_stdout("run-a").run();
 }
 
 #[test]
@@ -1130,11 +1127,7 @@ fn default_run_workspace() {
         .file("b/src/main.rs", r#"fn main() {println!("run-b");}"#)
         .build();
 
-    p.cargo("run")
-        .masquerade_as_nightly_cargo()
-        .with_status(0)
-        .with_stdout("run-a")
-        .run();
+    p.cargo("run").masquerade_as_nightly_cargo().with_stdout("run-a").run();
 }
 
 #[test]
diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs
index 1063e9837..5f176486d 100644
--- a/tests/testsuite/workspaces.rs
+++ b/tests/testsuite/workspaces.rs
@@ -2074,7 +2074,6 @@ fn ws_warn_unused() {
             .file("a/src/lib.rs", "")
             .build();
         p.cargo("check")
-            .with_status(0)
             .with_stderr_contains(&format!(
                 "\
 [WARNING] {} for the non root package will be ignored, specify {} at the workspace root:
@@ -2111,7 +2110,6 @@ fn ws_warn_path() {
         .build();
 
     p.cargo("check")
-        .with_status(0)
         .with_stderr_contains("[WARNING] [..]/foo/a/Cargo.toml: the cargo feature `edition`[..]")
         .run();
 }
-- 
2.39.2