diff options
53 files changed, 92 insertions, 77 deletions
diff --git a/.eslintignore b/.eslintignore index da42fb9d77a..ef029bad5ee 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,3 +4,4 @@ test/fixtures test/**/node_modules test/parallel/test-fs-non-number-arguments-throw.js test/disabled +test/tmp*/ diff --git a/test/common.js b/test/common.js index e88893cd1e8..704c64baf36 100644 --- a/test/common.js +++ b/test/common.js @@ -51,19 +51,17 @@ function rmdirSync(p, originalEr) { } } -function refreshTmpDir() { - if (!process.send) { // Not a child process - try { - rimrafSync(exports.tmpDir); - } catch (e) { - } +exports.refreshTmpDir = function() { + try { + rimrafSync(exports.tmpDir); + } catch (e) { + } - try { - fs.mkdirSync(exports.tmpDir); - } catch (e) { - } + try { + fs.mkdirSync(exports.tmpDir); + } catch (e) { } -} +}; if (process.env.TEST_THREAD_ID) { // Distribute ports in parallel tests @@ -74,8 +72,6 @@ if (process.env.TEST_THREAD_ID) { } exports.tmpDir = path.join(exports.testDir, exports.tmpDirName); -refreshTmpDir(); - var opensslCli = null; var inFreeBSDJail = null; var localhostIPv4 = null; diff --git a/test/fixtures/listen-on-socket-and-exit.js b/test/fixtures/listen-on-socket-and-exit.js index 9d844f071cd..7fb0d970de7 100644 --- a/test/fixtures/listen-on-socket-and-exit.js +++ b/test/fixtures/listen-on-socket-and-exit.js @@ -3,6 +3,8 @@ var common = require('../common'); var net = require('net'); +common.refreshTmpDir(); + var server = net.createServer().listen(common.PIPE, function() { console.log('child listening'); process.send('listening'); diff --git a/test/parallel/test-child-process-fork-exec-path.js b/test/parallel/test-child-process-fork-exec-path.js index cffb5ca05a6..6a61bddd8a1 100644 --- a/test/parallel/test-child-process-fork-exec-path.js +++ b/test/parallel/test-child-process-fork-exec-path.js @@ -15,6 +15,7 @@ if (process.env.FORK) { process.exit(); } else { + common.refreshTmpDir(); try { fs.unlinkSync(copyPath); } diff --git a/test/parallel/test-cluster-http-pipe.js b/test/parallel/test-cluster-http-pipe.js index 42ed3bee1ee..5ae3b138cc3 100644 --- a/test/parallel/test-cluster-http-pipe.js +++ b/test/parallel/test-cluster-http-pipe.js @@ -10,6 +10,7 @@ var cluster = require('cluster'); var http = require('http'); if (cluster.isMaster) { + common.refreshTmpDir(); var ok = false; var worker = cluster.fork(); worker.on('message', function(msg) { diff --git a/test/parallel/test-cwd-enoent-repl.js b/test/parallel/test-cwd-enoent-repl.js index 5f47b84be5b..da96c1094d4 100644 --- a/test/parallel/test-cwd-enoent-repl.js +++ b/test/parallel/test-cwd-enoent-repl.js @@ -11,6 +11,7 @@ if (process.platform === 'sunos' || process.platform === 'win32') { } var dirname = common.tmpDir + '/cwd-does-not-exist-' + process.pid; +common.refreshTmpDir(); fs.mkdirSync(dirname); process.chdir(dirname); fs.rmdirSync(dirname); diff --git a/test/parallel/test-cwd-enoent.js b/test/parallel/test-cwd-enoent.js index 0d0fde24814..edc64e8665c 100644 --- a/test/parallel/test-cwd-enoent.js +++ b/test/parallel/test-cwd-enoent.js @@ -11,6 +11,7 @@ if (process.platform === 'sunos' || process.platform === 'win32') { } var dirname = common.tmpDir + '/cwd-does-not-exist-' + process.pid; +common.refreshTmpDir(); fs.mkdirSync(dirname); process.chdir(dirname); fs.rmdirSync(dirname); diff --git a/test/parallel/test-file-write-stream.js b/test/parallel/test-file-write-stream.js index 7882d2370d9..7309a6bf9db 100644 --- a/test/parallel/test-file-write-stream.js +++ b/test/parallel/test-file-write-stream.js @@ -5,6 +5,7 @@ var assert = require('assert'); var path = require('path'); var fs = require('fs'); var fn = path.join(common.tmpDir, 'write.txt'); +common.refreshTmpDir(); var file = fs.createWriteStream(fn, { highWaterMark: 10 }); diff --git a/test/parallel/test-file-write-stream2.js b/test/parallel/test-file-write-stream2.js index 2563b1a300f..0044548b736 100644 --- a/test/parallel/test-file-write-stream2.js +++ b/test/parallel/test-file-write-stream2.js @@ -39,7 +39,7 @@ function removeTestFile() { } -removeTestFile(); +common.refreshTmpDir(); // drain at 0, return false at 10. file = fs.createWriteStream(filepath, { diff --git a/test/parallel/test-file-write-stream3.js b/test/parallel/test-file-write-stream3.js index 7223bd43f52..1a88faa01fb 100644 --- a/test/parallel/test-file-write-stream3.js +++ b/test/parallel/test-file-write-stream3.js @@ -39,7 +39,7 @@ function removeTestFile() { } -removeTestFile(); +common.refreshTmpDir(); function run_test_1() { diff --git a/test/parallel/test-fs-access.js b/test/parallel/test-fs-access.js index 6ad28612e9b..9c586692b8b 100644 --- a/test/parallel/test-fs-access.js +++ b/test/parallel/test-fs-access.js @@ -21,6 +21,7 @@ var createFileWithPerms = function(file, mode) { fs.chmodSync(file, mode); }; +common.refreshTmpDir(); createFileWithPerms(readOnlyFile, 0o444); createFileWithPerms(readWriteFile, 0o666); diff --git a/test/parallel/test-fs-append-file-sync.js b/test/parallel/test-fs-append-file-sync.js index 5a38014399d..bb9d2434724 100644 --- a/test/parallel/test-fs-append-file-sync.js +++ b/test/parallel/test-fs-append-file-sync.js @@ -15,6 +15,8 @@ var data = '南越国是前203年至前111年存在于岭南地区的一个国 '历经五代君主。南越国是岭南地区的第一个有记载的政权国家，采用封建制和郡县制并存的制度，' + '它的建立保证了秦末乱世岭南地区社会秩序的稳定，有效的改善了岭南地区落后的政治、##济现状。\n'; +common.refreshTmpDir(); + // test that empty file will be created and have content added var filename = join(common.tmpDir, 'append-sync.txt'); diff --git a/test/parallel/test-fs-append-file.js b/test/parallel/test-fs-append-file.js index 4cd75ccacc6..aa96f86b2b7 100644 --- a/test/parallel/test-fs-append-file.js +++ b/test/parallel/test-fs-append-file.js @@ -21,6 +21,8 @@ var s = '南越国是前203年至前111年存在于岭南地区的一个国家 var ncallbacks = 0; +common.refreshTmpDir(); + // test that empty file will be created and have content added fs.appendFile(filename, s, function(e) { if (e) throw e; diff --git a/test/parallel/test-fs-chmod.js b/test/parallel/test-fs-chmod.js index a9d694adecc..5d4a8a2b9c8 100644 --- a/test/parallel/test-fs-chmod.js +++ b/test/parallel/test-fs-chmod.js @@ -111,9 +111,7 @@ fs.open(file2, 'a', function(err, fd) { if (fs.lchmod) { var link = path.join(common.tmpDir, 'symbolic-link'); - try { - fs.unlinkSync(link); - } catch (er) {} + common.refreshTmpDir(); fs.symlinkSync(file2, link); fs.lchmod(link, mode_async, function(err) { diff --git a/test/parallel/test-fs-long-path.js b/test/parallel/test-fs-long-path.js index 158ba04f49d..6ecf5490296 100644 --- a/test/parallel/test-fs-long-path.js +++ b/test/parallel/test-fs-long-path.js @@ -11,12 +11,7 @@ var fileNameLen = Math.max(260 - common.tmpDir.length - 1, 1); var fileName = path.join(common.tmpDir, new Array(fileNameLen + 1).join('x')); var fullPath = path.resolve(fileName); -try { - fs.unlinkSync(fullPath); -} -catch (e) { - // Ignore. -} +common.refreshTmpDir(); console.log({ filenameLength: fileName.length, diff --git a/test/parallel/test-fs-mkdir.js b/test/parallel/test-fs-mkdir.js index b5451d20576..91a5a63fa59 100644 --- a/test/parallel/test-fs-mkdir.js +++ b/test/parallel/test-fs-mkdir.js @@ -10,6 +10,8 @@ function unlink(pathname) { } } +common.refreshTmpDir(); + (function() { var ncalls = 0; var pathname = common.tmpDir + '/test1'; diff --git a/test/parallel/test-fs-read-stream-fd.js b/test/parallel/test-fs-read-stream-fd.js index 450c56eb8a9..59ff3065896 100644 --- a/test/parallel/test-fs-read-stream-fd.js +++ b/test/parallel/test-fs-read-stream-fd.js @@ -10,6 +10,7 @@ var input = 'hello world'; var output = ''; var fd, stream; +common.refreshTmpDir(); fs.writeFileSync(file, input); fd = fs.openSync(file, 'r'); diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js index b2507306100..ac50e9c0134 100644 --- a/test/parallel/test-fs-readfile-pipe-large.js +++ b/test/parallel/test-fs-readfile-pipe-large.js @@ -15,6 +15,7 @@ var fs = require('fs'); var filename = path.join(common.tmpDir, '/readfile_pipe_large_test.txt'); var dataExpected = new Array(1000000).join('a'); +common.refreshTmpDir(); fs.writeFileSync(filename, dataExpected); if (process.argv[2] === 'child') { diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js index 78dbc31bea9..ebd093de69b 100644 --- a/test/parallel/test-fs-readfilesync-pipe-large.js +++ b/test/parallel/test-fs-readfilesync-pipe-large.js @@ -15,6 +15,7 @@ var fs = require('fs'); var filename = path.join(common.tmpDir, '/readfilesync_pipe_large_test.txt'); var dataExpected = new Array(1000000).join('a'); +common.refreshTmpDir(); fs.writeFileSync(filename, dataExpected); if (process.argv[2] === 'child') { diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index f0f6d4499c4..8b698fbdcfd 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -8,6 +8,8 @@ var async_completed = 0, async_expected = 0, unlink = []; var isWindows = process.platform === 'win32'; var skipSymlinks = false; +common.refreshTmpDir(); + var root = '/'; if (isWindows) { // something like "C:\\" @@ -575,9 +577,6 @@ function runTest() { var tmpDirs = ['cycles', 'cycles/folder']; tmpDirs.forEach(function(t) { t = tmp(t); - var s; - try { s = fs.statSync(t); } catch (ex) {} - if (s) return; fs.mkdirSync(t, 0o700); }); fs.writeFileSync(tmp('cycles/root.js'), "console.error('roooot!');"); diff --git a/test/parallel/test-fs-sir-writes-alot.js b/test/parallel/test-fs-sir-writes-alot.js index 537e94b0aca..1f949ed92a1 100644 --- a/test/parallel/test-fs-sir-writes-alot.js +++ b/test/parallel/test-fs-sir-writes-alot.js @@ -6,11 +6,7 @@ var join = require('path').join; var filename = join(common.tmpDir, 'out.txt'); -try { - fs.unlinkSync(filename); -} catch (e) { - // might not exist, that's okay. -} +common.refreshTmpDir(); var fd = fs.openSync(filename, 'w'); diff --git a/test/parallel/test-fs-stream-double-close.js b/test/parallel/test-fs-stream-double-close.js index 47d129c042b..6fb37d1ad29 100644 --- a/test/parallel/test-fs-stream-double-close.js +++ b/test/parallel/test-fs-stream-double-close.js @@ -3,6 +3,8 @@ var common = require('../common'); var assert = require('assert'); var fs = require('fs'); +common.refreshTmpDir(); + test1(fs.createReadStream(__filename)); test2(fs.createReadStream(__filename)); test3(fs.createReadStream(__filename)); diff --git a/test/parallel/test-fs-symlink-dir-junction-relative.js b/test/parallel/test-fs-symlink-dir-junction-relative.js index 6bf9e3f5b2d..dcc4e989cc1 100644 --- a/test/parallel/test-fs-symlink-dir-junction-relative.js +++ b/test/parallel/test-fs-symlink-dir-junction-relative.js @@ -13,10 +13,7 @@ var linkPath2 = path.join(common.tmpDir, 'junction2'); var linkTarget = path.join(common.fixturesDir); var linkData = '../fixtures'; -// Prepare. -try { fs.mkdirSync(common.tmpDir); } catch (e) {} -try { fs.unlinkSync(linkPath1); } catch (e) {} -try { fs.unlinkSync(linkPath2); } catch (e) {} +common.refreshTmpDir(); // Test fs.symlink() fs.symlink(linkData, linkPath1, 'junction', function(err) { diff --git a/test/parallel/test-fs-symlink-dir-junction.js b/test/parallel/test-fs-symlink-dir-junction.js index 84d6c066213..664366be182 100644 --- a/test/parallel/test-fs-symlink-dir-junction.js +++ b/test/parallel/test-fs-symlink-dir-junction.js @@ -10,10 +10,7 @@ var expected_tests = 4; var linkData = path.join(common.fixturesDir, 'cycles/'); var linkPath = path.join(common.tmpDir, 'cycles_link'); -// Delete previously created link -try { - fs.unlinkSync(linkPath); -} catch (e) {} +common.refreshTmpDir(); console.log('linkData: ' + linkData); console.log('linkPath: ' + linkPath); diff --git a/test/parallel/test-fs-symlink.js b/test/parallel/test-fs-symlink.js index e7faef930e4..dd35eac8e89 100644 --- a/test/parallel/test-fs-symlink.js +++ b/test/parallel/test-fs-symlink.js @@ -9,17 +9,14 @@ var expected_tests = 2; var is_windows = process.platform === 'win32'; +common.refreshTmpDir(); + var runtest = function(skip_symlinks) { if (!skip_symlinks) { // test creating and reading symbolic link var linkData = path.join(common.fixturesDir, '/cycles/root.js'); var linkPath = path.join(common.tmpDir, 'symlink1.js'); - // Delete previously created link - try { - fs.unlinkSync(linkPath); - } catch (e) {} - fs.symlink(linkData, linkPath, function(err) { if (err) throw err; console.log('symlink done'); @@ -36,11 +33,6 @@ var runtest = function(skip_symlinks) { var srcPath = path.join(common.fixturesDir, 'cycles', 'root.js'); var dstPath = path.join(common.tmpDir, 'link1.js'); - // Delete previously created link - try { - fs.unlinkSync(dstPath); - } catch (e) {} - fs.link(srcPath, dstPath, function(err) { if (err) throw err; console.log('hard link done'); diff --git a/test/parallel/test-fs-truncate-GH-6233.js b/test/parallel/test-fs-truncate-GH-6233.js index 866315434a0..023d08b1510 100644 --- a/test/parallel/test-fs-truncate-GH-6233.js +++ b/test/parallel/test-fs-truncate-GH-6233.js @@ -5,6 +5,8 @@ var fs = require('fs'); var filename = common.tmpDir + '/truncate-file.txt'; +common.refreshTmpDir(); + // Synchronous test. (function() { fs.writeFileSync(filename, '0123456789'); diff --git a/test/parallel/test-fs-truncate-fd.js b/test/parallel/test-fs-truncate-fd.js index ed3aedaee8c..a569c05915d 100644 --- a/test/parallel/test-fs-truncate-fd.js +++ b/test/parallel/test-fs-truncate-fd.js @@ -4,8 +4,7 @@ var assert = require('assert'); var path = require('path'); var fs = require('fs'); var tmp = common.tmpDir; -if (!fs.existsSync(tmp)) - fs.mkdirSync(tmp); +common.refreshTmpDir(); var filename = path.resolve(tmp, 'truncate-file.txt'); var success = 0; diff --git a/test/parallel/test-fs-truncate.js b/test/parallel/test-fs-truncate.js index df353f630eb..54e16bd3875 100644 --- a/test/parallel/test-fs-truncate.js +++ b/test/parallel/test-fs-truncate.js @@ -8,6 +8,8 @@ var filename = path.resolve(tmp, 'truncate-file.txt'); var data = new Buffer(1024 * 16); data.fill('x'); +common.refreshTmpDir(); + var stat; // truncateSync diff --git a/test/parallel/test-fs-write-buffer.js b/test/parallel/test-fs-write-buffer.js index edf33552cb3..dace4a19a18 100644 --- a/test/parallel/test-fs-write-buffer.js +++ b/test/parallel/test-fs-write-buffer.js @@ -10,6 +10,8 @@ var path = require('path'), writeCalled = 0; +common.refreshTmpDir(); + fs.open(filename, 'w', 0o644, function(err, fd) { openCalled++; if (err) throw err; diff --git a/test/parallel/test-fs-write-file-buffer.js b/test/parallel/test-fs-write-file-buffer.js index c1c263d409d..315ff87d782 100644 --- a/test/parallel/test-fs-write-file-buffer.js +++ b/test/parallel/test-fs-write-file-buffer.js @@ -25,6 +25,8 @@ var data = [ data = data.join('\n'); +common.refreshTmpDir(); + var buf = new Buffer(data, 'base64'); fs.writeFileSync(join(common.tmpDir, 'test.jpg'), buf); diff --git a/test/parallel/test-fs-write-file-sync.js b/test/parallel/test-fs-write-file-sync.js index 579ccd907c4..ea54db19456 100644 --- a/test/parallel/test-fs-write-file-sync.js +++ b/test/parallel/test-fs-write-file-sync.js @@ -26,9 +26,10 @@ if (isWindows) { mode = 0o755; } +common.refreshTmpDir(); + // Test writeFileSync var file1 = path.join(common.tmpDir, 'testWriteFileSync.txt'); -removeFile(file1); fs.writeFileSync(file1, '123', {mode: mode}); @@ -37,11 +38,8 @@ assert.equal('123', content); assert.equal(mode, fs.statSync(file1).mode & 0o777); -removeFile(file1); - // Test appendFileSync var file2 = path.join(common.tmpDir, 'testAppendFileSync.txt'); -removeFile(file2); fs.appendFileSync(file2, 'abc', {mode: mode}); @@ -50,23 +48,9 @@ assert.equal('abc', content); assert.equal(mode, fs.statSync(file2).mode & mode); -removeFile(file2); - // Verify that all opened files were closed. assert.equal(0, openCount); -// Removes a file if it exists. -function removeFile(file) { - try { - if (isWindows) - fs.chmodSync(file, 0o666); - fs.unlinkSync(file); - } catch (err) { - if (err && err.code !== 'ENOENT') - throw err; - } -} - function openSync() { openCount++; return fs._openSync.apply(fs, arguments); diff --git a/test/parallel/test-fs-write-file.js b/test/parallel/test-fs-write-file.js index b0c52f7a0ef..eafa7fdabde 100644 --- a/test/parallel/test-fs-write-file.js +++ b/test/parallel/test-fs-write-file.js @@ -4,6 +4,8 @@ var assert = require('assert'); var fs = require('fs'); var join = require('path').join; +common.refreshTmpDir(); + var filename = join(common.tmpDir, 'test.txt'); common.error('writing to ' + filename); diff --git a/test/parallel/test-fs-write-stream-change-open.js b/test/parallel/test-fs-write-stream-change-open.js index 43b57f5c725..a7503e1a603 100644 --- a/test/parallel/test-fs-write-stream-change-open.js +++ b/test/parallel/test-fs-write-stream-change-open.js @@ -7,6 +7,8 @@ var path = require('path'), var file = path.join(common.tmpDir, 'write.txt'); +common.refreshTmpDir(); + var stream = fs.WriteStream(file), _fs_close = fs.close, _fs_open = fs.open; diff --git a/test/parallel/test-fs-write-stream-encoding.js b/test/parallel/test-fs-write-stream-encoding.js index ca02d122e47..7dabebcd16b 100644 --- a/test/parallel/test-fs-write-stream-encoding.js +++ b/test/parallel/test-fs-write-stream-encoding.js @@ -10,6 +10,8 @@ const secondEncoding = 'binary'; const examplePath = path.join(common.fixturesDir, 'x.txt'); const dummyPath = path.join(common.tmpDir, 'x.txt'); +common.refreshTmpDir(); + const exampleReadStream = fs.createReadStream(examplePath, { encoding: firstEncoding }); diff --git a/test/parallel/test-fs-write-stream-end.js b/test/parallel/test-fs-write-stream-end.js index 1a4c0a89d69..a8af29d1327 100644 --- a/test/parallel/test-fs-write-stream-end.js +++ b/test/parallel/test-fs-write-stream-end.js @@ -4,6 +4,8 @@ var assert = require('assert'); var path = require('path'); var fs = require('fs'); +common.refreshTmpDir(); + (function() { var file = path.join(common.tmpDir, 'write-end-test0.txt'); var stream = fs.createWriteStream(file); diff --git a/test/parallel/test-fs-write-stream-err.js b/test/parallel/test-fs-write-stream-err.js index f3a608b62dc..bc289d45967 100644 --- a/test/parallel/test-fs-write-stream-err.js +++ b/test/parallel/test-fs-write-stream-err.js @@ -3,6 +3,8 @@ var common = require('../common'); var assert = require('assert'); var fs = require('fs'); +common.refreshTmpDir(); + var stream = fs.createWriteStream(common.tmpDir + '/out', { highWaterMark: 10 }); diff --git a/test/parallel/test-fs-write-stream-throw-type-error.js b/test/parallel/test-fs-write-stream-throw-type-error.js index 8568dd4eea4..6369722ac1e 100644 --- a/test/parallel/test-fs-write-stream-throw-type-error.js +++ b/test/parallel/test-fs-write-stream-throw-type-error.js @@ -6,6 +6,8 @@ const path = require('path'); const example = path.join(common.tmpDir, 'dummy'); +common.refreshTmpDir(); + assert.doesNotThrow(function() { fs.createWriteStream(example, undefined); }); diff --git a/test/parallel/test-fs-write-stream.js b/test/parallel/test-fs-write-stream.js index bf78b1ee521..3142e896325 100644 --- a/test/parallel/test-fs-write-stream.js +++ b/test/parallel/test-fs-write-stream.js @@ -7,6 +7,8 @@ var path = require('path'), var file = path.join(common.tmpDir, 'write.txt'); +common.refreshTmpDir(); + (function() { var stream = fs.WriteStream(file), _fs_close = fs.close; diff --git a/test/parallel/test-fs-write-string-coerce.js b/test/parallel/test-fs-write-string-coerce.js index 32f73172b76..1c43e719e44 100644 --- a/test/parallel/test-fs-write-string-coerce.js +++ b/test/parallel/test-fs-write-string-coerce.js @@ -4,6 +4,9 @@ var assert = require('assert'); var path = require('path'); var Buffer = require('buffer').Buffer; var fs = require('fs'); + +common.refreshTmpDir(); + var fn = path.join(common.tmpDir, 'write-string-coerce.txt'); var data = true; var expected = data + ''; diff --git a/test/parallel/test-fs-write-sync.js b/test/parallel/test-fs-write-sync.js index 2cdce58d874..83e60dd1cf9 100644 --- a/test/parallel/test-fs-write-sync.js +++ b/test/parallel/test-fs-write-sync.js @@ -5,6 +5,7 @@ var path = require('path'); var fs = require('fs'); var fn = path.join(common.tmpDir, 'write.txt'); +common.refreshTmpDir(); var foo = 'foo'; var fd = fs.openSync(fn, 'w'); diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js index a3d4cf83f8c..5ddd83e026c 100644 --- a/test/parallel/test-fs-write.js +++ b/test/parallel/test-fs-write.js @@ -10,6 +10,8 @@ var expected = 'ümlaut.'; var constants = require('constants'); var found, found2; +common.refreshTmpDir(); + fs.open(fn, 'w', 0o644, function(err, fd) { if (err) throw err; console.log('open done'); diff --git a/test/parallel/test-http-curl-chunk-problem.js b/test/parallel/test-http-curl-chunk-problem.js index 55fce4ad5e6..24f85e875af 100644 --- a/test/parallel/test-http-curl-chunk-problem.js +++ b/test/parallel/test-http-curl-chunk-problem.js @@ -30,6 +30,8 @@ function maybeMakeRequest() { } +common.refreshTmpDir(); + var ddcmd = common.ddCommand(filename, 10240); console.log('dd command: ', ddcmd); diff --git a/test/parallel/test-http-get-pipeline-problem.js b/test/parallel/test-http-get-pipeline-problem.js index 9c51bd11912..069658cf3f4 100644 --- a/test/parallel/test-http-get-pipeline-problem.js +++ b/test/parallel/test-http-get-pipeline-problem.js @@ -7,6 +7,8 @@ var assert = require('assert'); var http = require('http'); var fs = require('fs'); +common.refreshTmpDir(); + var image = fs.readFileSync(common.fixturesDir + '/person.jpg'); console.log('image.length = ' + image.length); diff --git a/test/parallel/test-http-pipe-fs.js b/test/parallel/test-http-pipe-fs.js index bfee9ce23f1..a5428d2b6bb 100644 --- a/test/parallel/test-http-pipe-fs.js +++ b/test/parallel/test-http-pipe-fs.js @@ -5,6 +5,8 @@ var http = require('http'); var fs = require('fs'); var path = require('path'); +common.refreshTmpDir(); + var file = path.join(common.tmpDir, 'http-pipe-fs-test.txt'); var requests = 0; diff --git a/test/parallel/test-https-truncate.js b/test/parallel/test-https-truncate.js index aba1be809ab..3ac87ba3522 100644 --- a/test/parallel/test-https-truncate.js +++ b/test/parallel/test-https-truncate.js @@ -11,8 +11,6 @@ var https = require('https'); var fs = require('fs'); var path = require('path'); -var resultFile = path.resolve(common.tmpDir, 'result'); - var key = fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'); var cert = fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem'); diff --git a/test/parallel/test-pipe-file-to-http.js b/test/parallel/test-pipe-file-to-http.js index 12ce742c905..aac59d917c0 100644 --- a/test/parallel/test-pipe-file-to-http.js +++ b/test/parallel/test-pipe-file-to-http.js @@ -6,6 +6,8 @@ var http = require('http'); var path = require('path'); var cp = require('child_process'); +common.refreshTmpDir(); + var filename = path.join(common.tmpDir || '/tmp', 'big'); var clientReqComplete = false; var count = 0; diff --git a/test/parallel/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js index dd92c76a33d..f63b61bf41e 100644 --- a/test/parallel/test-repl-.save.load.js +++ b/test/parallel/test-repl-.save.load.js @@ -5,6 +5,8 @@ var join = require('path').join; var fs = require('fs'); var common = require('../common'); +common.refreshTmpDir(); + var repl = require('repl'); // A stream to push an array into a REPL diff --git a/test/parallel/test-zlib-from-gzip.js b/test/parallel/test-zlib-from-gzip.js index 6076a6f09ba..5d1c4bb562d 100644 --- a/test/parallel/test-zlib-from-gzip.js +++ b/test/parallel/test-zlib-from-gzip.js @@ -7,6 +7,8 @@ var assert = require('assert'); var zlib = require('zlib'); var path = require('path'); +common.refreshTmpDir(); + var gunzip = zlib.createGunzip(); var fs = require('fs'); diff --git a/test/sequential/test-fs-watch-recursive.js b/test/sequential/test-fs-watch-recursive.js index 91a2701e1c0..0a18b94f56b 100644 --- a/test/sequential/test-fs-watch-recursive.js +++ b/test/sequential/test-fs-watch-recursive.js @@ -15,6 +15,8 @@ if (process.platform === 'darwin') { var relativePathOne = path.join('testsubdir', filenameOne); var filepathOne = path.join(testsubdir, filenameOne); + common.refreshTmpDir(); + process.on('exit', function() { assert.ok(watchSeenOne > 0); }); diff --git a/test/sequential/test-fs-watch.js b/test/sequential/test-fs-watch.js index 1cfaad9b3ec..70788c58534 100644 --- a/test/sequential/test-fs-watch.js +++ b/test/sequential/test-fs-watch.js @@ -32,11 +32,7 @@ process.on('exit', function() { assert.ok(watchSeenThree > 0); }); -// Clean up stale files (if any) from previous run. -try { fs.unlinkSync(filepathOne); } catch (e) { } -try { fs.unlinkSync(filepathTwoAbs); } catch (e) { } -try { fs.unlinkSync(filepathThree); } catch (e) { } -try { fs.rmdirSync(testsubdir); } catch (e) { } +common.refreshTmpDir(); fs.writeFileSync(filepathOne, 'hello'); diff --git a/test/sequential/test-mkdir-rmdir.js b/test/sequential/test-mkdir-rmdir.js index 7bd156419e8..976dbf6c2aa 100644 --- a/test/sequential/test-mkdir-rmdir.js +++ b/test/sequential/test-mkdir-rmdir.js @@ -4,6 +4,8 @@ var assert = require('assert'); var path = require('path'); var fs = require('fs'); +common.refreshTmpDir(); + var dirname = path.dirname(__filename); var d = path.join(common.tmpDir, 'dir'); diff --git a/test/sequential/test-regress-GH-4027.js b/test/sequential/test-regress-GH-4027.js index da91be95b84..80780fd6a2c 100644 --- a/test/sequential/test-regress-GH-4027.js +++ b/test/sequential/test-regress-GH-4027.js @@ -4,6 +4,8 @@ var assert = require('assert'); var path = require('path'); var fs = require('fs'); +common.refreshTmpDir(); + var filename = path.join(common.tmpDir, 'watched'); fs.writeFileSync(filename, 'quis custodiet ipsos custodes'); setTimeout(fs.unlinkSync, 100, filename); diff --git a/test/sequential/test-stdout-to-file.js b/test/sequential/test-stdout-to-file.js index 4ef473e57ad..95374768836 100644 --- a/test/sequential/test-stdout-to-file.js +++ b/test/sequential/test-stdout-to-file.js @@ -9,6 +9,8 @@ var scriptString = path.join(common.fixturesDir, 'print-chars.js'); var scriptBuffer = path.join(common.fixturesDir, 'print-chars-from-buffer.js'); var tmpFile = path.join(common.tmpDir, 'stdout.txt'); +common.refreshTmpDir(); + function test(size, useBuffer, cb) { var cmd = '"' + process.argv[0] + '"' + ' ' + |