Browse Source

test: do not modify fixtures in test-fs-chmod

`test-fs-chmod` modifies the permissions on files in `test/fixtures`.
This change has the test use the temp directory instead. One of the
fixture files is not used by any other test, so it has been deleted.

I took this opportunity to remove `console.log()` statements from the
test.

PR-URL: https://github.com/nodejs/node/pull/14926
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
canary-base
Rich Trott 7 years ago
committed by James M Snell
parent
commit
779a480bf1
  1. 46
      test/fixtures/a1.js
  2. 17
      test/parallel/test-fs-chmod.js

46
test/fixtures/a1.js

@ -1,46 +0,0 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
const c = require('./b/c');
console.error('load fixtures/a.js');
var string = 'A';
exports.SomeClass = c.SomeClass;
exports.A = function() {
return string;
};
exports.C = function() {
return c.C();
};
exports.D = function() {
return c.D();
};
exports.number = 42;
process.on('exit', function() {
string = 'A done';
});

17
test/parallel/test-fs-chmod.js

@ -71,14 +71,17 @@ if (common.isWindows) {
mode_sync = 0o644; mode_sync = 0o644;
} }
const file1 = path.join(common.fixturesDir, 'a.js'); common.refreshTmpDir();
const file2 = path.join(common.fixturesDir, 'a1.js');
const file1 = path.join(common.tmpDir, 'a.js');
const file2 = path.join(common.tmpDir, 'a1.js');
// Create file1.
fs.closeSync(fs.openSync(file1, 'w'));
fs.chmod(file1, mode_async.toString(8), common.mustCall((err) => { fs.chmod(file1, mode_async.toString(8), common.mustCall((err) => {
assert.ifError(err); assert.ifError(err);
console.log(fs.statSync(file1).mode);
if (common.isWindows) { if (common.isWindows) {
assert.ok((fs.statSync(file1).mode & 0o777) & mode_async); assert.ok((fs.statSync(file1).mode & 0o777) & mode_async);
} else { } else {
@ -93,14 +96,12 @@ fs.chmod(file1, mode_async.toString(8), common.mustCall((err) => {
} }
})); }));
fs.open(file2, 'a', common.mustCall((err, fd) => { fs.open(file2, 'w', common.mustCall((err, fd) => {
assert.ifError(err); assert.ifError(err);
fs.fchmod(fd, mode_async.toString(8), common.mustCall((err) => { fs.fchmod(fd, mode_async.toString(8), common.mustCall((err) => {
assert.ifError(err); assert.ifError(err);
console.log(fs.fstatSync(fd).mode);
if (common.isWindows) { if (common.isWindows) {
assert.ok((fs.fstatSync(fd).mode & 0o777) & mode_async); assert.ok((fs.fstatSync(fd).mode & 0o777) & mode_async);
} else { } else {
@ -122,13 +123,11 @@ fs.open(file2, 'a', common.mustCall((err, fd) => {
if (fs.lchmod) { if (fs.lchmod) {
const link = path.join(common.tmpDir, 'symbolic-link'); const link = path.join(common.tmpDir, 'symbolic-link');
common.refreshTmpDir();
fs.symlinkSync(file2, link); fs.symlinkSync(file2, link);
fs.lchmod(link, mode_async, common.mustCall((err) => { fs.lchmod(link, mode_async, common.mustCall((err) => {
assert.ifError(err); assert.ifError(err);
console.log(fs.lstatSync(link).mode);
assert.strictEqual(mode_async, fs.lstatSync(link).mode & 0o777); assert.strictEqual(mode_async, fs.lstatSync(link).mode & 0o777);
fs.lchmodSync(link, mode_sync); fs.lchmodSync(link, mode_sync);

Loading…
Cancel
Save