Commit f1b26be
test: remove common.tmpDirName
`common.tmpDirName` is used in only one test and can be replaced with
`path.basename(common.tmpDir)`.
PR-URL: #17266
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>1 parent cc91a00 commit f1b26be
3 files changed
Lines changed: 4 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -376,11 +376,6 @@ Synchronous version of `spawnPwd`. | |||
| 376 | 376 | ||
| 377 | 377 | The realpath of the 'tmp' directory. | |
| 378 | 378 | ||
| 379 | - ### tmpDirName | ||
| 380 | - * return [<String>] | ||
| 381 | - | ||
| 382 | - Name of the temp directory used by tests. | ||
| 383 | - | ||
| 384 | 379 | ## Countdown Module | |
| 385 | 380 | ||
| 386 | 381 | The `Countdown` module provides a simple countdown mechanism for tests that | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,7 +40,7 @@ exports.fixturesDir = fixturesDir; | |||
| 40 | 40 | ||
| 41 | 41 | // Using a `.` prefixed name, which is the convention for "hidden" on POSIX, | |
| 42 | 42 | // gets tools to ignore it by default or by simple rules, especially eslint. | |
| 43 | - exports.tmpDirName = '.tmp'; | ||
| 43 | + let tmpDirName = '.tmp'; | ||
| 44 | 44 | // PORT should match the definition in test/testpy/__init__.py. | |
| 45 | 45 | exports.PORT = +process.env.NODE_COMMON_PORT || 12346; | |
| 46 | 46 | exports.isWindows = process.platform === 'win32'; | |
@@ -165,9 +165,9 @@ exports.refreshTmpDir = function() { | |||
| 165 | 165 | ||
| 166 | 166 | if (process.env.TEST_THREAD_ID) { | |
| 167 | 167 | exports.PORT += process.env.TEST_THREAD_ID * 100; | |
| 168 | - exports.tmpDirName += `.${process.env.TEST_THREAD_ID}`; | ||
| 168 | + tmpDirName += `.${process.env.TEST_THREAD_ID}`; | ||
| 169 | 169 | } | |
| 170 | - exports.tmpDir = path.join(testRoot, exports.tmpDirName); | ||
| 170 | + exports.tmpDir = path.join(testRoot, tmpDirName); | ||
| 171 | 171 | ||
| 172 | 172 | let opensslCli = null; | |
| 173 | 173 | let inFreeBSDJail = null; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -111,7 +111,7 @@ function test_simple_relative_symlink(realpath, realpathSync, callback) { | |||
| 111 | 111 | const entry = `${tmpDir}/symlink`; | |
| 112 | 112 | const expected = `${tmpDir}/cycles/root.js`; | |
| 113 | 113 | [ | |
| 114 | - [entry, `../${common.tmpDirName}/cycles/root.js`] | ||
| 114 | + [entry, `../${path.basename(tmpDir)}/cycles/root.js`] | ||
| 115 | 115 | ].forEach(function(t) { | |
| 116 | 116 | try { fs.unlinkSync(t[0]); } catch (e) {} | |
| 117 | 117 | console.log('fs.symlinkSync(%j, %j, %j)', t[1], t[0], 'file'); | |
0 commit comments