dsada

Author: tritao

test/src/e2e_vm_tests/mod.rs

@@ -14,6 +14,7 @@ use core::fmt;
 use forc_pkg::manifest::{GenericManifestFile, ManifestFile};
 use forc_pkg::BuildProfile;
 use forc_test::ecal::Syscall;
+use forc_tracing::ansi_output_enabled;
 use forc_util::tx_utils::decode_log_data;
 use fuel_vm::fuel_tx;
 use fuel_vm::prelude::*;
@@ -1512,29 +1513,33 @@ fn print_run_results(
         );
     } else {
         tracing::info!("_________________________________");
+        let result_label = if number_of_tests_failed == 0 {
+            format_maybe_colored("ok", |txt| txt.green().bold())
+        } else {
+            format_maybe_colored("failed", |txt| txt.red().bold())
+        };
         tracing::info!(
             "Sway tests result: {}. {} total, {} passed; {} failed; {} disabled [test duration: {}]",
-            if number_of_tests_failed == 0 {
-                "ok".green().bold()
-            } else {
-                "failed".red().bold()
-            },
+            result_label,
             tests_in_run.total_number_of_tests,
             number_of_tests_executed - number_of_tests_failed,
             number_of_tests_failed,
             tests_in_run.disabled_tests.len(),
             util::duration_to_str(duration),
         );
         if number_of_tests_failed > 0 {
-            tracing::info!("{}", "Failing tests:".red().bold());
+            tracing::info!(
+                "{}",
+                format_maybe_colored("Failing tests:", |txt| txt.red().bold())
+            );
             tracing::info!(
                 "    {}",
                 failed_tests
                     .iter()
                     .map(|failed_test| format!(
                         "{} ... {}",
-                        failed_test.bold(),
-                        "failed".red().bold()
+                        format_maybe_colored(failed_test, |txt| txt.bold()),
+                        format_maybe_colored("failed", |txt| txt.red().bold())
                     ))
                     .collect::<Vec<_>>()
                     .join("\n    ")
@@ -1938,6 +1943,17 @@ fn get_test_abi_from_value(value: &toml::Value) -> Result<BuildTarget> {
     }
 }
 
+fn format_maybe_colored(
+    text: &str,
+    formatter: impl FnOnce(&str) -> colored::ColoredString,
+) -> String {
+    if ansi_output_enabled() {
+        formatter(text).to_string()
+    } else {
+        text.to_owned()
+    }
+}
+
 fn get_build_profile_from_value(value: &toml::Value) -> Result<&'static str> {
     match value.as_str() {
         Some(profile) => match profile {

test/src/snapshot/mod.rs

@@ -328,7 +328,9 @@ fn run_cmds(
                     let o = duct::cmd!("bash", "-c", cmd.clone())
                         .dir(repo_root.clone())
                         .stderr_to_stdout()
-                        .stdout_capture();
+                        .stdout_capture()
+                        .env("FORC_TERM_COLOR", "never")
+                        .env("NO_COLOR", "1");
 
                     let o = if let Some(last_output) = last_output.as_ref() {
                         o.stdin_bytes(last_output.as_bytes())