diff --git a/test/common/index.js b/test/common/index.js index 90df0a4e698cb7..6a1b6509d12a6f 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -39,8 +39,9 @@ const noop = () => {}; // Using a `.` prefixed name, which is the convention for "hidden" on POSIX, // gets tools to ignore it by default or by simple rules, especially eslint. let tmpDirName = '.tmp'; -// PORT should match the definition in test/testpy/__init__.py. + exports.PORT = +process.env.NODE_COMMON_PORT || 12346; + exports.isWindows = process.platform === 'win32'; exports.isWOW64 = exports.isWindows && (process.env.PROCESSOR_ARCHITEW6432 !== undefined); @@ -162,7 +163,6 @@ exports.refreshTmpDir = function() { }; if (process.env.TEST_THREAD_ID) { - exports.PORT += process.env.TEST_THREAD_ID * 100; tmpDirName += `.${process.env.TEST_THREAD_ID}`; } exports.tmpDir = path.join(testRoot, tmpDirName); diff --git a/test/testpy/__init__.py b/test/testpy/__init__.py index f113c1253a477f..455d57f4d9157a 100644 --- a/test/testpy/__init__.py +++ b/test/testpy/__init__.py @@ -61,10 +61,7 @@ def GetCommand(self): source = open(self.file).read() flags_match = FLAGS_PATTERN.search(source) if flags_match: - # PORT should match the definition in test/common/index.js. - env = { 'PORT': int(os.getenv('NODE_COMMON_PORT', '12346')) } - env['PORT'] += self.thread_id * 100 - flag = flags_match.group(1).strip().format(**env).split() + flag = flags_match.group(1).strip().split() # The following block reads config.gypi to extract the v8_enable_inspector # value. This is done to check if the inspector is disabled in which case # the '--inspect' flag cannot be passed to the node process as it will