test: fix undeclared variable access

Fixes all cases of undeclared variable access as uncovered by the no-undef rule of eslint. PR-URL: #1794 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
nodejs · Jun 11, 2015 · ff8202c · ff8202c
1 parent 8732977
commit ff8202c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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);