test: replaces fixturesDir with fixtures by mikemfleming · Pull Request #15835 · nodejs/node

mikemfleming · 2017-10-06T16:54:07Z

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)

behold, my first commit to node.js coming from node interactive in Vancouver. this commit updates the common.fixturesDir method in the https-timeout test.

pawelgolda · 2017-10-06T18:21:45Z

test/parallel/test-https-timeout.js

 const options = {
-  key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
-  cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
+  key: fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`),


common module does not export fixtures. This should be using method fixtures.readKey to get keys.

Yeah, this is not quite correct. The change would be first to:

const fixtures = require('../common/fixtures');

Then...

const options = { key: fixtures.readKey('agent1-key.pem'), cert: fixtures.readKey('agent1-cert.pem') }

jasnell

Thank you very much for participating in the code-and-learn! We appreciate the contribution!

There are a couple of things that need to be corrected about this PR. You can do so by making the changes suggested below and adding a new commit to your development branch.

jasnell · 2017-10-09T17:39:51Z

test/parallel/test-https-timeout.js

 const options = {
-  key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
-  cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
+  key: fs.readFileSync(`${common.fixtures}/keys/agent1-key.pem`),


Yeah, this is not quite correct. The change would be first to:

const fixtures = require('../common/fixtures');

Then...

const options = { key: fixtures.readKey('agent1-key.pem'), cert: fixtures.readKey('agent1-cert.pem') }

gireeshpunathil · 2017-10-10T12:10:07Z

/cc ping @mikemfleming to see if they can make the suggested changes.

mikemfleming · 2017-10-11T16:32:29Z

Just saw this, working on it now!

gireeshpunathil · 2017-10-13T04:19:14Z

test/parallel/test-https-timeout.js


 'use strict';
 const common = require('../common');
+const fixtures = require('../common/fixtures');


@ mikemfleming - on a second look, I guess this require statement can move down the line, after the hasCrypto check.

gireeshpunathil · 2017-10-13T04:20:07Z

test/parallel/test-https-timeout.js

@@ -30,8 +31,8 @@ const https = require('https');
 const fs = require('fs');


@ mikemfleming - on a second look, the requiring of fs module is not used anywhere in the test, and I guess is likely to invite linter error. Will you remove this please?

Just removed it

gireeshpunathil · 2017-10-14T05:43:24Z

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

joyeecheung · 2017-10-14T09:16:49Z

Landed in 3043937, thank you for the contribution!

This commit updates the common.fixturesDir method in the https-timeout test. PR-URL: #15835 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

This commit updates the common.fixturesDir method in the https-timeout test. PR-URL: nodejs/node#15835 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

This commit updates the common.fixturesDir method in the https-timeout test. PR-URL: #15835 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

nodejs-github-bot added the test Issues and PRs related to the tests. label Oct 6, 2017

mikemfleming force-pushed the common-fixtures branch from e5c0958 to 09afadb Compare October 6, 2017 17:34

mikemfleming changed the title ~~replaces fixturesDir with fixtures~~ test: replaces fixturesDir with fixtures Oct 6, 2017

test: replaces fixturesDir with fixtures

dc66f9e

behold, my first commit to node.js coming from node interactive in Vancouver. this commit updates the common.fixturesDir method in the https-timeout test.

mikemfleming force-pushed the common-fixtures branch from 09afadb to dc66f9e Compare October 6, 2017 17:36

pawelgolda reviewed Oct 6, 2017

View reviewed changes

mscdex added the https Issues or PRs related to the https subsystem. label Oct 6, 2017

Trott added the code-and-learn Issues related to the Code-and-Learn events and PRs submitted during the events. label Oct 6, 2017

jasnell requested changes Oct 9, 2017

View reviewed changes

requires fixtures, calls readkey

3282e66

gireeshpunathil approved these changes Oct 11, 2017

View reviewed changes

jasnell approved these changes Oct 13, 2017

View reviewed changes

gireeshpunathil reviewed Oct 13, 2017

View reviewed changes

removes fs module, requires fixtures after crypto check

d35adde

mikemfleming force-pushed the common-fixtures branch from fcb3052 to d35adde Compare October 13, 2017 19:51

lpinca approved these changes Oct 14, 2017

View reviewed changes

joyeecheung closed this Oct 14, 2017

MylesBorins added the land-on-v6.x label Nov 16, 2017

MylesBorins mentioned this pull request Nov 21, 2017

v6.12.1 proposal #17180

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

test: replaces fixturesDir with fixtures#15835

test: replaces fixturesDir with fixtures#15835
mikemfleming wants to merge 3 commits intonodejs:masterfrom
mikemfleming:common-fixtures

mikemfleming commented Oct 6, 2017 •

edited

Loading

Uh oh!

pawelgolda Oct 6, 2017

Uh oh!

jasnell Oct 9, 2017

Uh oh!

jasnell left a comment

Uh oh!

jasnell Oct 9, 2017

Uh oh!

gireeshpunathil commented Oct 10, 2017

Uh oh!

mikemfleming commented Oct 11, 2017

Uh oh!

gireeshpunathil Oct 13, 2017

Uh oh!

gireeshpunathil Oct 13, 2017

Uh oh!

mikemfleming Oct 13, 2017

Uh oh!

gireeshpunathil Oct 14, 2017

Uh oh!

gireeshpunathil commented Oct 14, 2017

Uh oh!

joyeecheung commented Oct 14, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

		@@ -30,8 +31,8 @@ const https = require('https');
		const fs = require('fs');

Uh oh!

Conversation

mikemfleming commented Oct 6, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Affected core subsystem(s)

Uh oh!

pawelgolda Oct 6, 2017

Choose a reason for hiding this comment

Uh oh!

jasnell Oct 9, 2017

Choose a reason for hiding this comment

Uh oh!

jasnell left a comment

Choose a reason for hiding this comment

Uh oh!

jasnell Oct 9, 2017

Choose a reason for hiding this comment

Uh oh!

gireeshpunathil commented Oct 10, 2017

Uh oh!

mikemfleming commented Oct 11, 2017

Uh oh!

gireeshpunathil Oct 13, 2017

Choose a reason for hiding this comment

Uh oh!

gireeshpunathil Oct 13, 2017

Choose a reason for hiding this comment

Uh oh!

mikemfleming Oct 13, 2017

Choose a reason for hiding this comment

Uh oh!

gireeshpunathil Oct 14, 2017

Choose a reason for hiding this comment

Uh oh!

gireeshpunathil commented Oct 14, 2017

Uh oh!

joyeecheung commented Oct 14, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

mikemfleming commented Oct 6, 2017 •

edited

Loading