From d30b7483c4d035e9a3fa94114557ae9d5f058f79 Mon Sep 17 00:00:00 2001
From: Alex Liu <DonutEspresso@users.noreply.github.com>
Date: Mon, 15 Apr 2019 16:59:01 -0700
Subject: [PATCH] fix(test): make upgrade test pass (#1772)

---
 Makefile               | 4 ----
 test/server.test.js    | 2 +-
 test/upgrade.test.js   | 5 +++--
 tools/mk/Makefile.targ | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d35ca8955..932b8b2b6 100644
--- a/Makefile
+++ b/Makefile
@@ -70,9 +70,5 @@ docs-build:
 benchmark:
 	@(cd ./benchmark && $(NPM) i && $(NODE) index.js)
 
-.PHONY: audit
-audit:
-	@($(NPM) audit || true)
-
 include ./tools/mk/Makefile.deps
 include ./tools/mk/Makefile.targ
diff --git a/test/server.test.js b/test/server.test.js
index 62c25927b..4e7e3382d 100644
--- a/test/server.test.js
+++ b/test/server.test.js
@@ -34,7 +34,7 @@ var FAST_CLIENT;
 var SERVER;
 
 if (SKIP_IP_V6) {
-    console.warning('IPv6 tests are skipped: No IPv6 network is available');
+    console.warn('IPv6 tests are skipped: No IPv6 network is available');
 }
 
 ///--- Tests
diff --git a/test/upgrade.test.js b/test/upgrade.test.js
index f674b1613..a9079cc0f 100644
--- a/test/upgrade.test.js
+++ b/test/upgrade.test.js
@@ -174,8 +174,7 @@ test('Dueling upgrade and response handling 1', function(t) {
         }
 
         try {
-            var upg = res.claimUpgrade();
-            upg.socket.destroy();
+            res.claimUpgrade();
         } catch (ex) {
             done('expected requestUpgrade error');
         }
@@ -205,6 +204,8 @@ test('Dueling upgrade and response handling 1', function(t) {
             res.on('end', function() {
                 done('client response');
             });
+            // noop data listener required for resume to take effect
+            res.on('data', function() {});
             res.resume();
         });
         req.on('upgradeResult', function(err2, res) {
diff --git a/tools/mk/Makefile.targ b/tools/mk/Makefile.targ
index 4f0d89b8f..a17a7fb4d 100644
--- a/tools/mk/Makefile.targ
+++ b/tools/mk/Makefile.targ
@@ -244,4 +244,4 @@ $(DOC_MEDIA_DIRS_BUILD):
 test:
 
 .PHONY: prepush
-prepush: check test audit
+prepush: check test