From 45fbdbc2dcede8115687ae02619854ed974c7d1f Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Sun, 12 May 2019 09:44:02 +0800
Subject: improve tests (#3408)

---
 test/jetstream.js   | 13 +++++++++++--
 test/release/run.js |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/jetstream.js b/test/jetstream.js
index 2d85dfdd..e7c846e6 100644
--- a/test/jetstream.js
+++ b/test/jetstream.js
@@ -62,8 +62,17 @@ if (typeof phantom == "undefined") {
         if (debug) {
             console.log("http://localhost:" + port + "/");
         } else {
-            child_process.exec("npm install phantomjs-prebuilt@2.1.14 --no-save", function(error) {
-                if (error) throw error;
+            child_process.spawn(process.platform == "win32" ? "npm.cmd" : "npm", [
+                "install",
+                "phantomjs-prebuilt@2.1.14",
+                "--no-audit",
+                "--no-optional",
+                "--no-save",
+                "--no-update-notifier",
+            ], {
+                stdio: [ "ignore", 1, 2 ]
+            }).on("exit", function(code) {
+                if (code) throw new Error("npm install failed!");
                 var program = require("phantomjs-prebuilt").exec(process.argv[1], port);
                 program.stdout.pipe(process.stdout);
                 program.stderr.pipe(process.stderr);
diff --git a/test/release/run.js b/test/release/run.js
index 7b4755dc..5dc85193 100644
--- a/test/release/run.js
+++ b/test/release/run.js
@@ -6,10 +6,10 @@ module.exports = function(tasks) {
         var args = tasks.shift();
         console.log();
         console.log("\u001B[36m$> " + args.join(" ") + "\u001B[39m");
-        var result = child_process.spawn(process.argv[0], args, {
+        child_process.spawn(process.argv[0], args, {
             stdio: [ "ignore", 1, 2 ]
         }).on("exit", function(code) {
-            if (code != 0) process.exit(code);
+            if (code) process.exit(code);
             next();
         });
     })();
-- 
cgit v1.2.3

ss='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e7cacc91e66105d5ffe70420d201bcf8adc2a765'>root</a>/<a href='/guix/log/nix?id=e7cacc91e66105d5ffe70420d201bcf8adc2a765'>nix</a>/<a href='/guix/log/nix/libstore?id=e7cacc91e66105d5ffe70420d201bcf8adc2a765'>libstore</a>/<a href='/guix/log/nix/libstore/optimise-store.cc?id=e7cacc91e66105d5ffe70420d201bcf8adc2a765'>optimise-store.cc</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/libstore/optimise-store.cc?id=e7cacc91e66105d5ffe70420d201bcf8adc2a765&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-06-25 12:29:22 +0200'>2020-06-25</span></td><td><a href='/guix/commit/nix/libstore/optimise-store.cc?id=b930f0ba2115f71c323d4bf3d72efb763f716296'>daemon: Correctly handle EMLINK corner case when deduplicating.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>