From 93fac9c3fd12abb5757ac07c2e259ed73223d279 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 7 Oct 2015 20:53:38 -0700 Subject: [PATCH 1/2] test: remove common.inspect() common.inspect() is just util.inspect(). common copies every property from util but this is the only one that gets used and it only gets used in three places. Well, four, but the fourth is removed in a pending PR. This commit removes it. Subsequently, the "copy util to common" part of `common` can be removed altogether. --- test/parallel/test-fs-realpath.js | 43 +++++---------------- test/parallel/test-memory-usage.js | 1 - test/sequential/test-memory-usage-emfile.js | 1 - 3 files changed, 9 insertions(+), 36 deletions(-) diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index fc2db16e1049..e64217b3bda5 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -94,14 +94,10 @@ function test_simple_relative_symlink(callback) { }); var result = fs.realpathSync(entry); assert.equal(result, path.resolve(expected), - 'got ' + common.inspect(result) + ' expected ' + - common.inspect(expected)); + 'got ' + result + ' expected ' + expected); asynctest(fs.realpath, [entry], callback, function(err, result) { assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(expected)); + 'got ' + result + ' expected ' + expected); }); } @@ -126,16 +122,10 @@ function test_simple_absolute_symlink(callback) { }); var result = fs.realpathSync(entry); assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(expected)); + 'got ' + result + ' expected ' + expected); asynctest(fs.realpath, [entry], callback, function(err, result) { assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(expected)); + 'got ' + result + ' expected ' + expected); }); } @@ -164,10 +154,7 @@ function test_deep_relative_file_symlink(callback) { assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + 'got ' + result + ' expected ' + path.resolve(expected)); }); } @@ -196,10 +183,7 @@ function test_deep_relative_dir_symlink(callback) { asynctest(fs.realpath, [entry], callback, function(err, result) { assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + 'got ' + result + ' expected ' + path.resolve(expected)); }); } @@ -281,10 +265,7 @@ function test_relative_input_cwd(callback) { asynctest(fs.realpath, [entry], callback, function(err, result) { process.chdir(origcwd); assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + 'got ' + result + ' expected ' + path.resolve(expected)); return true; }); } @@ -337,10 +318,7 @@ function test_deep_symlink_mix(callback) { assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + 'got ' + result + ' expected ' + path.resolve(expected)); return true; }); } @@ -356,10 +334,7 @@ function test_non_symlinks(callback) { asynctest(fs.realpath, [entry], callback, function(err, result) { process.chdir(origcwd); assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + 'got ' + result + ' expected ' + path.resolve(expected)); return true; }); } diff --git a/test/parallel/test-memory-usage.js b/test/parallel/test-memory-usage.js index 09dc4f820a8d..8394fc16599e 100644 --- a/test/parallel/test-memory-usage.js +++ b/test/parallel/test-memory-usage.js @@ -3,5 +3,4 @@ var common = require('../common'); var assert = require('assert'); var r = process.memoryUsage(); -console.log(common.inspect(r)); assert.equal(true, r['rss'] > 0); diff --git a/test/sequential/test-memory-usage-emfile.js b/test/sequential/test-memory-usage-emfile.js index e4f85488f40d..6b4390498057 100644 --- a/test/sequential/test-memory-usage-emfile.js +++ b/test/sequential/test-memory-usage-emfile.js @@ -10,5 +10,4 @@ while (files.length < 256) files.push(fs.openSync(__filename, 'r')); var r = process.memoryUsage(); -console.log(common.inspect(r)); assert.equal(true, r['rss'] > 0); From 0fd50706cf54be6ea595788b7050d9b5be244e40 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 7 Oct 2015 22:26:37 -0700 Subject: [PATCH 2/2] fixup --- test/parallel/test-fs-realpath.js | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index e64217b3bda5..12a4ce7b41b6 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -93,11 +93,9 @@ function test_simple_relative_symlink(callback) { unlink.push(t[0]); }); var result = fs.realpathSync(entry); - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + expected); + assert.equal(result, path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + expected); + assert.equal(result, path.resolve(expected)); }); } @@ -121,11 +119,9 @@ function test_simple_absolute_symlink(callback) { unlink.push(t[0]); }); var result = fs.realpathSync(entry); - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + expected); + assert.equal(result, path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + expected); + assert.equal(result, path.resolve(expected)); }); } @@ -153,8 +149,7 @@ function test_deep_relative_file_symlink(callback) { assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + path.resolve(expected)); + assert.equal(result, path.resolve(expected)); }); } @@ -182,8 +177,7 @@ function test_deep_relative_dir_symlink(callback) { assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + path.resolve(expected)); + assert.equal(result, path.resolve(expected)); }); } @@ -264,8 +258,7 @@ function test_relative_input_cwd(callback) { assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { process.chdir(origcwd); - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + path.resolve(expected)); + assert.equal(result, path.resolve(expected)); return true; }); } @@ -317,8 +310,7 @@ function test_deep_symlink_mix(callback) { var expected = tmpAbsDir + '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/cycles/root.js'; assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + path.resolve(expected)); + assert.equal(result, path.resolve(expected)); return true; }); } @@ -333,8 +325,7 @@ function test_non_symlinks(callback) { assert.equal(fs.realpathSync(entry), path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { process.chdir(origcwd); - assert.equal(result, path.resolve(expected), - 'got ' + result + ' expected ' + path.resolve(expected)); + assert.equal(result, path.resolve(expected)); return true; }); }