Commit 39e2fb6
test: simplify common.PORT code
common.PORT is no longer used in parallelized tests and should not be.
Remove code that accommodates parallelized tests.
PR-URL: #17559
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>1 parent f7a1e39 commit 39e2fb6
2 files changed
Lines changed: 3 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -39,8 +39,9 @@ const noop = () => {}; | |||
| 39 | 39 | // Using a `.` prefixed name, which is the convention for "hidden" on POSIX, | |
| 40 | 40 | // gets tools to ignore it by default or by simple rules, especially eslint. | |
| 41 | 41 | let tmpDirName = '.tmp'; | |
| 42 | - // PORT should match the definition in test/testpy/__init__.py. | ||
| 42 | + | ||
| 43 | 43 | exports.PORT = +process.env.NODE_COMMON_PORT || 12346; | |
| 44 | + | ||
| 44 | 45 | exports.isWindows = process.platform === 'win32'; | |
| 45 | 46 | exports.isWOW64 = exports.isWindows && | |
| 46 | 47 | (process.env.PROCESSOR_ARCHITEW6432 !== undefined); | |
@@ -162,7 +163,6 @@ exports.refreshTmpDir = function() { | |||
| 162 | 163 | }; | |
| 163 | 164 | ||
| 164 | 165 | if (process.env.TEST_THREAD_ID) { | |
| 165 | - exports.PORT += process.env.TEST_THREAD_ID * 100; | ||
| 166 | 166 | tmpDirName += `.${process.env.TEST_THREAD_ID}`; | |
| 167 | 167 | } | |
| 168 | 168 | exports.tmpDir = path.join(testRoot, tmpDirName); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -61,10 +61,7 @@ def GetCommand(self): | |||
| 61 | 61 | source = open(self.file).read() | |
| 62 | 62 | flags_match = FLAGS_PATTERN.search(source) | |
| 63 | 63 | if flags_match: | |
| 64 | - # PORT should match the definition in test/common/index.js. | ||
| 65 | - env = { 'PORT': int(os.getenv('NODE_COMMON_PORT', '12346')) } | ||
| 66 | - env['PORT'] += self.thread_id * 100 | ||
| 67 | - flag = flags_match.group(1).strip().format(**env).split() | ||
| 64 | + flag = flags_match.group(1).strip().split() | ||
| 68 | 65 | # The following block reads config.gypi to extract the v8_enable_inspector | |
| 69 | 66 | # value. This is done to check if the inspector is disabled in which case | |
| 70 | 67 | # the '--inspect' flag cannot be passed to the node process as it will | |
0 commit comments