Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools,test: throw if common.PORT used in parallel tests #17559

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
test: simplify common.PORT code
common.PORT is no longer used in parallelized tests and should not be.
Remove code that accommodates parallelized tests.
  • Loading branch information
Trott committed Dec 9, 2017
commit 2b71536b292f9795c89a7638ee00ccf397525078
4 changes: 2 additions & 2 deletions test/common/index.js
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 1 addition & 4 deletions test/testpy/__init__.py
Original file line number Diff line number Diff line change
@@ -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