From f0f8afd8795ae6e86129ab5ad1b15b9069454db4 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 7 Oct 2015 20:53:38 -0700 Subject: [PATCH] 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. PR-URL: https://github.com/nodejs/node/pull/3257 Reviewed-By: Sakthipriyan Vairamani Reviewed-By: Evan Lucas --- test/parallel/test-fs-realpath.js | 52 ++++----------------- test/parallel/test-memory-usage.js | 1 - test/sequential/test-memory-usage-emfile.js | 1 - 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index fc2db16e10..12a4ce7b41 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -93,15 +93,9 @@ function test_simple_relative_symlink(callback) { unlink.push(t[0]); }); var result = fs.realpathSync(entry); - assert.equal(result, path.resolve(expected), - 'got ' + common.inspect(result) + ' expected ' + - common.inspect(expected)); + assert.equal(result, path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(expected)); + assert.equal(result, path.resolve(expected)); }); } @@ -125,17 +119,9 @@ function test_simple_absolute_symlink(callback) { unlink.push(t[0]); }); var result = fs.realpathSync(entry); - assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(expected)); + assert.equal(result, path.resolve(expected)); asynctest(fs.realpath, [entry], callback, function(err, result) { - assert.equal(result, path.resolve(expected), - 'got ' + - common.inspect(result) + - ' expected ' + - common.inspect(expected)); + assert.equal(result, path.resolve(expected)); }); } @@ -163,11 +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 ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + assert.equal(result, path.resolve(expected)); }); } @@ -195,11 +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 ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + assert.equal(result, path.resolve(expected)); }); } @@ -280,11 +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 ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + assert.equal(result, path.resolve(expected)); return true; }); } @@ -336,11 +310,7 @@ function test_deep_symlink_mix(callback) { var expected = tmpAbsDir + '/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 ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + assert.equal(result, path.resolve(expected)); return true; }); } @@ -355,11 +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 ' + - common.inspect(result) + - ' expected ' + - common.inspect(path.resolve(expected))); + assert.equal(result, path.resolve(expected)); return true; }); } diff --git a/test/parallel/test-memory-usage.js b/test/parallel/test-memory-usage.js index 09dc4f820a..8394fc1659 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 e4f85488f4..6b43904980 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);