From ae27cb8ea389310014c453354d7668014bdc8491 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 18 Aug 2017 13:03:20 -0700
Subject: [PATCH] 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>
---
 test/fixtures/a1.js            | 46 ----------------------------------
 test/parallel/test-fs-chmod.js | 17 ++++++-------
 2 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 test/fixtures/a1.js

diff --git a/test/fixtures/a1.js b/test/fixtures/a1.js
deleted file mode 100644
index 4c8725279577ec..00000000000000
--- a/test/fixtures/a1.js
+++ /dev/null
@@ -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';
-});
diff --git a/test/parallel/test-fs-chmod.js b/test/parallel/test-fs-chmod.js
index de48b096c68b74..7d4b7a10dbd9b4 100644
--- a/test/parallel/test-fs-chmod.js
+++ b/test/parallel/test-fs-chmod.js
@@ -71,14 +71,17 @@ if (common.isWindows) {
   mode_sync = 0o644;
 }
 
-const file1 = path.join(common.fixturesDir, 'a.js');
-const file2 = path.join(common.fixturesDir, 'a1.js');
+common.refreshTmpDir();
+
+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) => {
   assert.ifError(err);
 
-  console.log(fs.statSync(file1).mode);
-
   if (common.isWindows) {
     assert.ok((fs.statSync(file1).mode & 0o777) & mode_async);
   } 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);
 
   fs.fchmod(fd, mode_async.toString(8), common.mustCall((err) => {
     assert.ifError(err);
 
-    console.log(fs.fstatSync(fd).mode);
-
     if (common.isWindows) {
       assert.ok((fs.fstatSync(fd).mode & 0o777) & mode_async);
     } else {
@@ -122,13 +123,11 @@ fs.open(file2, 'a', common.mustCall((err, fd) => {
 if (fs.lchmod) {
   const link = path.join(common.tmpDir, 'symbolic-link');
 
-  common.refreshTmpDir();
   fs.symlinkSync(file2, link);
 
   fs.lchmod(link, mode_async, common.mustCall((err) => {
     assert.ifError(err);
 
-    console.log(fs.lstatSync(link).mode);
     assert.strictEqual(mode_async, fs.lstatSync(link).mode & 0o777);
 
     fs.lchmodSync(link, mode_sync);