test: fix undeclared variable access

Fixes all cases of undeclared variable access as uncovered by the
no-undef rule of eslint.

PR-URL: https://github.com/nodejs/io.js/pull/1794
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

diff --git a/test/parallel/test-cluster-worker-exit.js b/test/parallel/test-cluster-worker-exit.js
index 982b099cd1cfe184aa89c2e5b94cdcce0c5999e3..3607a992a33dff0ea347c6995b49d9c486e7bfca 100644 (file)
--- a/test/parallel/test-cluster-worker-exit.js
+++ b/test/parallel/test-cluster-worker-exit.js
@@ -106,17 +106,13 @@ function checkResults(expected_results, results) {
     var actual = results[k],
         expected = expected_results[k];
 
-    if (typeof expected === 'function') {
-      expected(r[k]);
-    } else {
-      var msg = (expected[1] || '') +
-          (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
+    var msg = (expected[1] || '') +
+        (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
 
-      if (expected && expected.length) {
-        assert.equal(actual, expected[0], msg);
-      } else {
-        assert.equal(actual, expected, msg);
-      }
+    if (expected && expected.length) {
+      assert.equal(actual, expected[0], msg);
+    } else {
+      assert.equal(actual, expected, msg);
     }
   }
 }

diff --git a/test/parallel/test-cluster-worker-kill.js b/test/parallel/test-cluster-worker-kill.js
index c73cf2dbd5216e73e7bf2063c790a0958645d0be..e12b466610171ac32596887fc1484dbd607940e3 100644 (file)
--- a/test/parallel/test-cluster-worker-kill.js
+++ b/test/parallel/test-cluster-worker-kill.js
@@ -106,16 +106,12 @@ function checkResults(expected_results, results) {
     var actual = results[k],
         expected = expected_results[k];
 
-    if (typeof expected === 'function') {
-      expected(r[k]);
+    var msg = (expected[1] || '') +
+        (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
+    if (expected && expected.length) {
+      assert.equal(actual, expected[0], msg);
     } else {
-      var msg = (expected[1] || '') +
-          (' [expected: ' + expected[0] + ' / actual: ' + actual + ']');
-      if (expected && expected.length) {
-        assert.equal(actual, expected[0], msg);
-      } else {
-        assert.equal(actual, expected, msg);
-      }
+      assert.equal(actual, expected, msg);
     }
   }
 }

diff --git a/test/pummel/test-net-timeout.js b/test/pummel/test-net-timeout.js
index 347e3a4344d37ba3f34d60e1ed2782bd734b96f4..25544a6d5f598960c11ec4c8e57fec83c019994a 100644 (file)
--- a/test/pummel/test-net-timeout.js
+++ b/test/pummel/test-net-timeout.js
@@ -79,7 +79,7 @@ process.on('exit', function() {
   assert.ok(starttime != null);
   assert.ok(timeouttime != null);
 
-  diff = timeouttime - starttime;
+  var diff = timeouttime - starttime;
   console.log('diff = ' + diff);
 
   assert.ok(timeout < diff);