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

test: update test to use fixtures #15844

Closed
wants to merge 5 commits into from
Closed

test: update test to use fixtures #15844

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5a085e
test: replaced common.fixturesDir with common.fixtures
dinophile Oct 6, 2017
8110afd
test: added fixtures.path() to const options
dinophile Oct 6, 2017
6dd3bb7
test: replced fixturesDir with fixtures.readKey()
dinophile Oct 10, 2017
6e84d1f
fixed waywrad characters
dinophile Oct 10, 2017
391f0f1
moved fixtures declaration to after common.hasCrypto check
dinophile Oct 11, 2017
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
12 changes: 6 additions & 6 deletions test/parallel/test-tls-multi-key.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright Joyent, Inc. and other Node contributors.
no// Copyright Joyent, Inc. and other Node contributors.
Copy link
Member

Choose a reason for hiding this comment

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

unexpected manual error? please correct it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh dear...trackpad issues! Thanks! Fixed!

//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
Expand All @@ -21,21 +21,21 @@

'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: would you mind moving this after the common.hasCrypto check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not at all! Done!

if (!common.hasCrypto)
common.skip('missing crypto');

const assert = require('assert');
const tls = require('tls');
const fs = require('fs');

const options = {
key: [
fs.readFileSync(`${common.fixturesDir}/keys/ec-key.pem`),
fs.readFileSync(`${common.fixturesDir}/keys/agent1-key.pem`),
fixtures.readKey('ec-key.pem'),
fixtures.readKey('agent1-key.pem'),
],
cert: [
fs.readFileSync(`${common.fixturesDir}/keys/agent1-cert.pem`),
fs.readFileSync(`${common.fixturesDir}/keys/ec-cert.pem`)
fixtures.readKey('agent1-cert.pem'),
fixtures.readKey('ec-cert.pem'),
]
};

Expand Down