1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: don't assume a certain folder structure

Browse Source 
A few tests assumed that temp dirs always lived in the same
parent folder as fixtures. Make these use `common.tmpDir` instead.

PR-URL: https://github.com/nodejs/node/pull/3325
Reviewed-By: Joao Reis <reis@janeasystems.com>
This commit is contained in:
Johan Bergström 2015-12-30 12:11:17 +11:00
parent 8132b942a7
commit 842e5a10ac
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/parallel/test-fs-realpath.js
View File

@ -273,14 +273,14 @@ function test_deep_symlink_mix(callback) {
} }
/* /*
/tmp/node-test-realpath-f1 -> ../tmp/node-test-realpath-d1/foo /tmp/node-test-realpath-f1 -> $tmpDir/node-test-realpath-d1/foo
/tmp/node-test-realpath-d1 -> ../node-test-realpath-d2 /tmp/node-test-realpath-d1 -> $tmpDir/node-test-realpath-d2
/tmp/node-test-realpath-d2/foo -> ../node-test-realpath-f2 /tmp/node-test-realpath-d2/foo -> $tmpDir/node-test-realpath-f2
/tmp/node-test-realpath-f2 /tmp/node-test-realpath-f2
-> /node/test/fixtures/nested-index/one/realpath-c -> /node/test/fixtures/nested-index/one/realpath-c
/node/test/fixtures/nested-index/one/realpath-c /node/test/fixtures/nested-index/one/realpath-c
-> /node/test/fixtures/nested-index/two/realpath-c -> /node/test/fixtures/nested-index/two/realpath-c
/node/test/fixtures/nested-index/two/realpath-c -> ../../cycles/root.js /node/test/fixtures/nested-index/two/realpath-c -> $tmpDir/cycles/root.js
/node/test/fixtures/cycles/root.js (hard) /node/test/fixtures/cycles/root.js (hard)
*/ */
var entry = tmp('node-test-realpath-f1'); var entry = tmp('node-test-realpath-f1');
@ -289,16 +289,16 @@ function test_deep_symlink_mix(callback) {
fs.mkdirSync(tmp('node-test-realpath-d2'), 0o700); fs.mkdirSync(tmp('node-test-realpath-d2'), 0o700);
try { try {
[ [
[entry, '../' + common.tmpDirName + '/node-test-realpath-d1/foo'], [entry, common.tmpDir + '/node-test-realpath-d1/foo'],
[tmp('node-test-realpath-d1'), [tmp('node-test-realpath-d1'),
'../' + common.tmpDirName + '/node-test-realpath-d2'], common.tmpDir + '/node-test-realpath-d2'],
[tmp('node-test-realpath-d2/foo'), '../node-test-realpath-f2'], [tmp('node-test-realpath-d2/foo'), '../node-test-realpath-f2'],
[tmp('node-test-realpath-f2'), fixturesAbsDir + [tmp('node-test-realpath-f2'), fixturesAbsDir +
'/nested-index/one/realpath-c'], '/nested-index/one/realpath-c'],
[fixturesAbsDir + '/nested-index/one/realpath-c', fixturesAbsDir + [fixturesAbsDir + '/nested-index/one/realpath-c', fixturesAbsDir +
'/nested-index/two/realpath-c'], '/nested-index/two/realpath-c'],
[fixturesAbsDir + '/nested-index/two/realpath-c', [fixturesAbsDir + '/nested-index/two/realpath-c',
'../../../' + common.tmpDirName + '/cycles/root.js'] common.tmpDir + '/cycles/root.js']
].forEach(function(t) { ].forEach(function(t) {
try { fs.unlinkSync(t[0]); } catch (e) {} try { fs.unlinkSync(t[0]); } catch (e) {}
fs.symlinkSync(t[1], t[0]); fs.symlinkSync(t[1], t[0]);

3
test/parallel/test-fs-symlink-dir-junction-relative.js
View File

@ -11,7 +11,7 @@ var expected_tests = 2;
var linkPath1 = path.join(common.tmpDir, 'junction1'); var linkPath1 = path.join(common.tmpDir, 'junction1');
var linkPath2 = path.join(common.tmpDir, 'junction2'); var linkPath2 = path.join(common.tmpDir, 'junction2');
var linkTarget = path.join(common.fixturesDir); var linkTarget = path.join(common.fixturesDir);
var linkData = '../fixtures'; var linkData = path.join(common.fixturesDir);
common.refreshTmpDir(); common.refreshTmpDir();
@ -42,4 +42,3 @@ function verifyLink(linkPath) {
process.on('exit', function() { process.on('exit', function() {
assert.equal(completed, expected_tests); assert.equal(completed, expected_tests);
}); });