Merge pull request #521 from fitzgen/cargo-test-double-print

Only print `cargo test` output the once

Cargo.toml

@@ -38,6 +38,8 @@ binary-install = { version = "0.0.1", path = "./binary-install" }
 walkdir = "2"
 
 [dev-dependencies]
+assert_cmd = "0.10.2"
+predicates = "1.0.0"
 tempfile = "3"
 
 [features]

src/cache.rs

@@ -0,0 +1,14 @@
+//! Getting and configuring wasm-pack's binary cache.
+
+use binary_install::Cache;
+use std::env;
+use std::path::Path;
+
+/// Get wasm-pack's binary cache.
+pub fn get_wasm_pack_cache() -> Result<Cache, failure::Error> {
+    if let Ok(path) = env::var("WASM_PACK_CACHE") {
+        Ok(Cache::at(Path::new(&path)))
+    } else {
+        Cache::new("wasm-pack")
+    }
+}

src/command/build.rs

@@ -3,6 +3,7 @@
 use binary_install::{Cache, Download};
 use bindgen;
 use build;
+use cache;
 use command::utils::{create_pkg_dir, set_crate_path};
 use emoji;
 use failure::Error;
@@ -180,7 +181,7 @@ impl Build {
             mode: build_opts.mode,
             out_dir,
             bindgen: None,
-            cache: Cache::new("wasm_pack")?,
+            cache: cache::get_wasm_pack_cache()?,
             extra_options: build_opts.extra_options,
         })
     }

src/command/test.rs

@@ -4,6 +4,7 @@ use super::build::BuildMode;
 use binary_install::Cache;
 use bindgen;
 use build;
+use cache;
 use command::utils::set_crate_path;
 use console::style;
 use emoji;
@@ -132,7 +133,7 @@ impl Test {
         }
 
         Ok(Test {
-            cache: Cache::new("wasm_pack")?,
+            cache: cache::get_wasm_pack_cache()?,
             crate_path,
             crate_data,
             node,

src/lib.rs

@@ -28,6 +28,7 @@ extern crate walkdir;
 
 pub mod bindgen;
 pub mod build;
+pub mod cache;
 pub mod child;
 pub mod command;
 pub mod emoji;

src/progressbar.rs

@@ -43,6 +43,13 @@ impl ProgressOutput {
 
         let mut spinner = self.spinner.write();
         *spinner = Self::progressbar(message);
+
+        if !atty::is(atty::Stream::Stderr) {
+            // `indicatif` won't print any output if `stderr` is not a tty, so
+            // to ensure that our output is still emitted, we print it manually
+            // here.
+            eprintln!("{}", message)
+        }
     }
 
     fn add_message(&self, msg: &str) {

src/test/mod.rs

@@ -4,7 +4,6 @@ pub mod webdriver;
 
 use child;
 use failure::{self, ResultExt};
-use log::info;
 use std::ffi::OsStr;
 use std::path::Path;
 use std::process::Command;
@@ -17,20 +16,15 @@ where
     K: AsRef<OsStr>,
     V: AsRef<OsStr>,
 {
-    let output = {
-        let mut cmd = Command::new("cargo");
-        cmd.envs(envs);
-        cmd.current_dir(path).arg("test");
-        if release {
-            cmd.arg("--release");
-        }
-        cmd.arg("--target").arg("wasm32-unknown-unknown");
-        child::run(cmd, "cargo test").context("Running Wasm tests with wasm-bindgen-test failed")?
-    };
-
-    for line in output.lines() {
-        info!("test output: {}", line);
-        println!("{}", line);
+    let mut cmd = Command::new("cargo");
+    cmd.envs(envs);
+    cmd.current_dir(path).arg("test");
+    if release {
+        cmd.arg("--release");
     }
+    cmd.arg("--target").arg("wasm32-unknown-unknown");
+    child::run(cmd, "cargo test").context("Running Wasm tests with wasm-bindgen-test failed")?;
+
+    // NB: `child::run` took care of ensuring that test output gets printed.
     Ok(())
 }

tests/all/main.rs

@@ -1,4 +1,6 @@
+extern crate assert_cmd;
 extern crate failure;
+extern crate predicates;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]

tests/all/test.rs

@@ -1,4 +1,6 @@
+use assert_cmd::prelude::*;
 use failure::Error;
+use predicates::prelude::*;
 use std::env;
 use utils::fixture;
 use wasm_pack::command::{build, test, Command};
@@ -334,3 +336,43 @@ fn cdylib_not_required() {
     });
     fixture.run(cmd).unwrap();
 }
+
+#[test]
+fn test_output_is_printed_once() {
+    let fixture = fixture::Fixture::new();
+    fixture
+        .readme()
+        .cargo_toml("wbg-test-node")
+        .hello_world_src_lib()
+        .file(
+            "tests/node.rs",
+            r#"
+                extern crate wasm_bindgen;
+                extern crate wasm_bindgen_test;
+                use wasm_bindgen::prelude::*;
+                use wasm_bindgen_test::*;
+
+                #[wasm_bindgen]
+                extern {
+                    #[wasm_bindgen(js_namespace = console)]
+                    fn log(s: &str);
+                }
+
+                #[wasm_bindgen_test]
+                fn pass() {
+                    log("YABBA DABBA DOO");
+                    assert_eq!(1, 2);
+                }
+            "#,
+        );
+
+    fixture
+        .wasm_pack()
+        .arg("test")
+        .arg("--node")
+        .assert()
+        .stderr(predicate::function(|err: &str| {
+            err.matches("YABBA DABBA DOO").count() == 1
+        }))
+        .failure();
+}