fix(forge): exit with error code on fail fast (foundry-rs#4883) (foun…

…dry-rs#5146)
ololade97 · Jun 12, 2023 · 89f2782 · 89f2782
1 parent 19881cf
commit 89f2782
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 5 deletions.
diff --git a/cli/src/cmd/forge/test/mod.rs b/cli/src/cmd/forge/test/mod.rs
@@ -532,6 +532,8 @@ fn test(
             SignaturesIdentifier::new(Config::foundry_cache_dir(), config.offline)?;
 
         'outer: for (contract_name, suite_result) in rx {
+            results.insert(contract_name.clone(), suite_result.clone());
+
             let mut tests = suite_result.test_results.clone();
             println!();
             for warning in suite_result.warnings.iter() {
@@ -617,12 +619,9 @@ fn test(
                     }
                 }
             }
-            let block_outcome = TestOutcome::new(
-                [(contract_name.clone(), suite_result.clone())].into(),
-                allow_failure,
-            );
+            let block_outcome =
+                TestOutcome::new([(contract_name, suite_result)].into(), allow_failure);
             println!("{}", block_outcome.summary());
-            results.insert(contract_name, suite_result);
         }
 
         if gas_reporting {

diff --git a/cli/tests/it/test_cmd.rs b/cli/tests/it/test_cmd.rs
@@ -366,3 +366,41 @@ contract ContractTest is Test {
             .join("tests/fixtures/can_use_libs_in_multi_fork.stdout"),
     );
 });
+
+static FAILING_TEST: &str = r#"
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.17;
+
+import "forge-std/Test.sol";
+
+contract FailingTest is Test {
+    function testShouldFail() public {
+        assertTrue(false);
+    }
+}
+"#;
+
+forgetest_init!(exit_code_error_on_fail_fast, |prj: TestProject, mut cmd: TestCommand| {
+    prj.wipe_contracts();
+    prj.inner().add_source("failing_test", FAILING_TEST).unwrap();
+
+    // set up command
+    cmd.args(["test", "--fail-fast"]);
+
+    // run command and assert error exit code
+    cmd.assert_err();
+});
+
+forgetest_init!(
+    exit_code_error_on_fail_fast_with_json,
+    |prj: TestProject, mut cmd: TestCommand| {
+        prj.wipe_contracts();
+
+        prj.inner().add_source("failing_test", FAILING_TEST).unwrap();
+        // set up command
+        cmd.args(["test", "--fail-fast", "--json"]);
+
+        // run command and assert error exit code
+        cmd.assert_err();
+    }
+);