tools,test: throw if common.PORT used in parallel tests · nodejs/node@03d2514 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 03d2514

Browse filesBrowse the repository at this point in the historyBrowse files

Trott

authored and

MylesBorins

committed

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

common.PORT should not be used in parallelized tests. (There can be a port collision if another tests requests an arbitrary open port from the operating system and ends up getting common.PORT before a test that uses common.PORT uses the port.) In such a situation, throw an error. PR-URL: #17559 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>

1 parent 39e2fb6 commit 03d2514
Copy full SHA for 03d2514

2 files changed

+12-2Lines changed: 12 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test/common
  • index.js
• tools
  • test.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/common/index.js‎

Copy file name to clipboardExpand all lines: test/common/index.js

+10-1Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -40,7 +40,16 @@ const noop = () => {};
40	40	// gets tools to ignore it by default or by simple rules, especially eslint.
41	41	let tmpDirName = '.tmp';
42	42
43		- exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
	43	+ Object.defineProperty(exports, 'PORT', {
	44	+ get: () => {
	45	+ if (+process.env.TEST_PARALLEL) {
	46	+ throw new Error('common.PORT cannot be used in a parallelized test');
	47	+ }
	48	+ return +process.env.NODE_COMMON_PORT || 12346;
	49	+ },
	50	+ enumerable: true
	51	+ });
	52	+
44	53
45	54	exports.isWindows = process.platform === 'win32';
46	55	exports.isWOW64 = exports.isWindows &&

Collapse file

‎tools/test.py‎

Copy file name to clipboardExpand all lines: tools/test.py

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -532,7 +532,8 @@ def Run(self):
532	532
533	533	try:
534	534	result = self.RunCommand(self.GetCommand(), {
535		- "TEST_THREAD_ID": "%d" % self.thread_id
	535	+ "TEST_THREAD_ID": "%d" % self.thread_id,
	536	+ "TEST_PARALLEL" : "%d" % self.parallel
536	537	})
537	538	finally:
538	539	# Tests can leave the tty in non-blocking mode. If the test runner

0 commit comments

Comments

0 (0)