Merge "[FABN-1175] Move test temp directory"

hyperledger · Mar 12, 2019 · 66c666c · 66c666c
2 parents a1114dd + 7260b5d
commit 66c666c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,8 @@ tmp
 *.heapsnapshot
 
 #test files
+test/temp/**
+!test/temp/.noignore
 test/fixtures/crypto-material/crypto-config/
 test/fixtures/crypto-material/channel-config/
 test/fixtures/crypto-material/config-base/twoorgs.genesis.block

diff --git a/build/tasks/test.js b/build/tasks/test.js
@@ -24,7 +24,7 @@ const testConstants = require('../../test/unit/constants.js');
 process.env.DOCKER_DEBUG = 'INFO';
 
 // by default for running the tests print debug to a file
-const debugPath = path.join(testConstants.tempdir, 'test-log', 'debug.log');
+const debugPath = path.join(testConstants.tempdir, 'debug.log');
 process.env.HFC_LOGGING = util.format('{"debug":"%s"}', escapeWindowsPath(debugPath));
 
 function escapeWindowsPath(p) {

diff --git a/test/temp/.noignore b/test/temp/.noignore
diff --git a/test/unit/constants.js b/test/unit/constants.js
@@ -3,10 +3,10 @@
 
  SPDX-License-Identifier: Apache-2.0
 */
-const os = require('os');
 const path = require('path');
 
-const tempdir = path.join(os.tmpdir(), 'hfc');
+// test temp directory is /fabric-sdk-node/test/temp
+const tempdir = path.join(__dirname, '../temp');
 
 const TEST_CERT_PEM = '-----BEGIN CERTIFICATE-----' +
 'MIIDVDCCAvqgAwIBAgIBATAKBggqhkjOPQQDAjBOMRMwEQYDVQQKDArOoyBBY21l' +