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.

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

Jump to bottom

test: replaced fixturesDir with common.fixtures module #15836

Closed
wants to merge 2 commits into from
Closed

test: replaced fixturesDir with common.fixtures module #15836

wants to merge 2 commits into from

Conversation

dtoki
Copy link
Contributor

@dtoki dtoki commented Oct 6, 2017

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Oct 6, 2017
rmg
rmg reviewed Oct 6, 2017
View reviewed changes
Copy link
Contributor

@rmg rmg left a comment

Choose a reason for hiding this comment

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

Thanks for making Node.js better!

test/parallel/test-tls-async-cb-after-socket-end.js Outdated
@@ -12,8 +13,8 @@ const tls = require('tls');

const options = {
secureOptions: SSL_OP_NO_TICKET,
key: fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')),
cert: fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem'))
key: fs.readFileSync(path.join(fixtures.fixturesDir, 'test_key.pem')),
Copy link
Contributor

Choose a reason for hiding this comment

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

This could be cleaned up further by making use of fixtures.readSync() to replace the fs.readFileSuync and the path.join!

Something like key: fixtures.readSync('test_key.pem'),

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh thanks for pointing that out, will make changes now.

@Trott Trott added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Oct 6, 2017
@mscdex mscdex added the tls Issues and PRs related to the tls subsystem. label Oct 6, 2017
@dtoki dtoki force-pushed the test-fixtures-tls branch from fd41c22 to db07d1f Compare October 6, 2017 22:17
@dtoki
Copy link
Contributor Author

dtoki commented Oct 6, 2017 •
edited
Loading

should I squash the commit's into one or is this okay?

@rmg
Copy link
Contributor

rmg commented Oct 6, 2017

@dtoki technically whoever lands it could take care of that, but if you've got the time/energy it's highly appreciated :-)

gireeshpunathil
gireeshpunathil approved these changes Oct 10, 2017
View reviewed changes
Copy link
Member

@gireeshpunathil gireeshpunathil left a comment

Choose a reason for hiding this comment

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

CI: https://ci.nodejs.org/job/node-test-pull-request/10575/

lpinca
lpinca approved these changes Oct 11, 2017
View reviewed changes
test/parallel/test-tls-async-cb-after-socket-end.js
@@ -1,19 +1,16 @@
'use strict';

const common = require('../common');
const fixtures = require('../common/fixtures');
Copy link
Member

Choose a reason for hiding this comment

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

Nit: can you please move this after the common.hasCrypto check?

@joyeecheung
Copy link
Member

Landed in c42cdd4 with #15836 (review) fixed. Thanks for the contribution!

joyeecheung pushed a commit that referenced this pull request Oct 13, 2017
@dtoki @joyeecheung
test: replaced fixturesDir with common.fixtures
c42cdd4 
PR-URL: #15836
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
addaleax pushed a commit to ayojs/ayo that referenced this pull request Oct 15, 2017
@dtoki @addaleax
test: replaced fixturesDir with common.fixtures
5061370 
PR-URL: nodejs/node#15836
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
targos pushed a commit that referenced this pull request Oct 18, 2017
@dtoki @targos
test: replaced fixturesDir with common.fixtures
1469eff 
PR-URL: #15836
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 16, 2017
@dtoki @MylesBorins
test: replaced fixturesDir with common.fixtures
854d143 
PR-URL: #15836
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@MylesBorins MylesBorins mentioned this pull request Nov 21, 2017
Merged
MylesBorins pushed a commit that referenced this pull request Nov 21, 2017
@dtoki @MylesBorins
test: replaced fixturesDir with common.fixtures
30d6964 
PR-URL: #15836
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 28, 2017
@dtoki @MylesBorins
test: replaced fixturesDir with common.fixtures
6d33564 
PR-URL: #15836
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rmg rmg rmg left review comments

@gireeshpunathil gireeshpunathil gireeshpunathil approved these changes

@lpinca lpinca lpinca approved these changes

@benjamingr benjamingr benjamingr approved these changes

@jasnell jasnell jasnell approved these changes

@lance lance lance approved these changes

Assignees
No one assigned
Labels
code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. test Issues and PRs related to the tests. tls Issues and PRs related to the tls subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.