Skip to content

[pull] master from Melon-Tropics:master #142

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.

Sign up for GitHub

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

Merged
pull merged 3 commits into from
Mar 2, 2020
Merged

[pull] master from Melon-Tropics:master #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ac42f1
test: remove common.port from test-tls-securepair-client
Trott Feb 29, 2020
5e1f059
test: move test-inspector-module to parallel
Trott Feb 29, 2020
ed8007a
events: convert errorMonitor to a normal property
Flarna Feb 18, 2020
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
7 changes: 1 addition & 6 deletions lib/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,7 @@ ObjectDefineProperty(EventEmitter, 'captureRejections', {
enumerable: true
});

ObjectDefineProperty(EventEmitter, 'errorMonitor', {
value: kErrorMonitor,
writable: false,
configurable: true,
enumerable: true
});
EventEmitter.errorMonitor = kErrorMonitor;

// The default for captureRejections is false
ObjectDefineProperty(EventEmitter.prototype, kCapture, {
Expand Down
0 test/sequential/test-inspector-module.js → test/parallel/test-inspector-module.js
View file
Open in desktop
File renamed without changes.
13 changes: 7 additions & 6 deletions test/sequential/test-tls-securepair-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function test(keyPath, certPath, check, next) {
const cert = fixtures.readSync(certPath).toString();

const server = spawn(common.opensslCli, ['s_server',
'-accept', common.PORT,
'-accept', 0,
'-cert', fixtures.path(certPath),
'-key', fixtures.path(keyPath)]);
server.stdout.pipe(process.stdout);
Expand All @@ -78,10 +78,11 @@ function test(keyPath, certPath, check, next) {
console.log(state);
switch (state) {
case 'WAIT-ACCEPT':
if (/ACCEPT/.test(serverStdoutBuffer)) {
// Give s_server half a second to start up.
setTimeout(startClient, 500);
const matches = serverStdoutBuffer.match(/ACCEPT .*?:(\d+)/);
if (matches) {
const port = matches[1];
state = 'WAIT-HELLO';
startClient(port);
}
break;

Expand Down Expand Up @@ -117,7 +118,7 @@ function test(keyPath, certPath, check, next) {
});


function startClient() {
function startClient(port) {
const s = new net.Stream();

const sslcontext = tls.createSecureContext({ key, cert });
Expand All @@ -131,7 +132,7 @@ function test(keyPath, certPath, check, next) {
pair.encrypted.pipe(s);
s.pipe(pair.encrypted);

s.connect(common.PORT);
s.connect(port);

s.on('connect', function() {
console.log('client connected');
Expand Down