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 common.fixturesDir with fixtures.fixturesDir #15848

Closed
wants to merge 3 commits into from
Closed

test: replaced common.fixturesDir with fixtures.fixturesDir #15848

wants to merge 3 commits into from

Conversation

joeldart
Copy link
Contributor

@joeldart joeldart commented Oct 6, 2017

moved to using the common.fixtures module in test

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)

tests

@nodejs-github-bot nodejs-github-bot added the test Issues and PRs related to the tests. label Oct 6, 2017
pawelgolda
pawelgolda reviewed Oct 6, 2017
View reviewed changes
test/parallel/test-tls-disable-renegotiation.js Outdated
@@ -11,8 +12,8 @@ if (!common.hasCrypto)
const tls = require('tls');

const options = {
key: fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
cert: fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`)
key: fs.readFileSync(`${fixtures.fixturesDir}/keys/agent1-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 using method fixtures.readKey instead of fs.readFileSync to get the keys.

rmg
rmg approved these changes 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.

Looks great! Thanks for making Node.js more awesome!

@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
@refack refack self-assigned this Oct 10, 2017
@Trott
Copy link
Member

Trott commented Oct 10, 2017

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

@Trott Trott mentioned this pull request Oct 10, 2017
Closed
2 tasks
lpinca
lpinca approved these changes Oct 11, 2017
View reviewed changes
test/parallel/test-tls-disable-renegotiation.js
@@ -1,7 +1,7 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const fs = require('fs');
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 and the assert require after the common.hasCrypto check?

Trott pushed a commit to Trott/io.js that referenced this pull request Oct 11, 2017
@joeldart @Trott
test: replace fixturesDir with fixtures module
c4cb061 
PR-URL: nodejs#15848
Reviewed-By: Ryan Graham <r.m.graham@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@Trott
Copy link
Member

Trott commented Oct 11, 2017

Landed in c4cb061.
Thanks for the contribution! 🎉

(I took care of @lpinca's nit while landing.)

@Trott Trott closed this Oct 11, 2017
@Trott
Copy link
Member

Trott commented Oct 12, 2017

Argh, I made the nit changes, but didn't commit them. 🤦‍♂️ Sorry, @lpinca! :-D

addaleax pushed a commit to ayojs/ayo that referenced this pull request Oct 15, 2017
@joeldart @addaleax
test: replace fixturesDir with fixtures module
a964ccd 
PR-URL: nodejs/node#15848
Reviewed-By: Ryan Graham <r.m.graham@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
targos pushed a commit that referenced this pull request Oct 18, 2017
@joeldart @targos
test: replace fixturesDir with fixtures module
ba6ede6 
PR-URL: #15848
Reviewed-By: Ryan Graham <r.m.graham@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
targos pushed a commit that referenced this pull request Oct 18, 2017
@joeldart @targos
test: replace fixturesDir with fixtures module
e47366e 
PR-URL: #15848
Reviewed-By: Ryan Graham <r.m.graham@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@refack refack removed their assignment Oct 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pawelgolda pawelgolda pawelgolda left review comments

@rmg rmg rmg approved these changes

@jasnell jasnell jasnell approved these changes

@Trott Trott Trott approved these changes

@benjamingr benjamingr benjamingr approved these changes

@lpinca lpinca lpinca approved these changes

@cjihrig cjihrig cjihrig approved these changes

@tniessen tniessen tniessen approved these changes

@richardlau richardlau richardlau 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.