Skip to content

test: change indexOf to includes in ecdh-disable #9989

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

Closed
ancapaaron wants to merge 2 commits into from
Closed

test: change indexOf to includes in ecdh-disable #9989

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b083b7
test: change indexOf to includes in ecdh-disable
Dec 1, 2016
c6d99b0
test: common.mustCall on server.listen
Dec 5, 2016
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: change indexOf to includes in ecdh-disable 
Updates test/parallel/test-tls-ecdh-disable.js on line 34 so that
assert.notEqual is changed to just assert. Then in place of indexOf,
includes() is used. The callback on line 31 has been wrapped in
common.mustCall() in order to ensure that this callback is only
made one time.
  • Loading branch information
Aaron Williams committed Dec 1, 2016
commit 4b083b77d098e5e7738abf74814df907957e6468
6 changes: 3 additions & 3 deletions test/parallel/test-tls-ecdh-disable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ server.listen(0, '127.0.0.1', function() {
if (common.isWindows)
cmd += ' -no_rand_screen';

exec(cmd, function(err, stdout, stderr) {
exec(cmd, common.mustCall(function(err, stdout, stderr) {
Copy link
Copy Markdown
Contributor

@cjihrig cjihrig Dec 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also needs a common.mustCall() on the server.listen() callback.

Copy link
Copy Markdown
Author

@ancapaaron ancapaaron Dec 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjihrig Went ahead and updated this. Thank you for the feedback.

// Old versions of openssl will still exit with 0 so we
// can't just check if err is not null.
assert.notEqual(stderr.indexOf('handshake failure'), -1);
assert(stderr.includes('handshake failure'));
server.close();
});
}));
});