Skip to content

Remove uncommon functions from common module #17781

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
Trott wants to merge 4 commits into from
Closed

Remove uncommon functions from common module #17781

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69eb221
test: remove common.projectDir
Trott Dec 20, 2017
19bd327
test: remove getTTYfd() from common module
Trott Dec 20, 2017
cfa5ae0
test: move firstInvalidFD() out of common module
Trott Dec 20, 2017
8be1259
test: fix buggy getTTYfd() implementation
Trott Dec 20, 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
Prev Previous commit
Next Next commit
test: move firstInvalidFD() out of common module 
common.firstInvalidFD() is used in only one test. Move it out of the
common module and into the one test that uses it.
  • Loading branch information
@Trott
Trott committed Dec 20, 2017
commit cfa5ae082ceaf351724f2a77319ced2ef2fb936e
9 changes: 0 additions & 9 deletions test/common/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,12 +851,3 @@ exports.hijackStdout = hijackStdWritable.bind(null, 'stdout');
exports.hijackStderr = hijackStdWritable.bind(null, 'stderr');
exports.restoreStdout = restoreWritable.bind(null, 'stdout');
exports.restoreStderr = restoreWritable.bind(null, 'stderr');

let fd = 2;
exports.firstInvalidFD = function firstInvalidFD() {
// Get first known bad file descriptor.
try {
while (fs.fstatSync(++fd));
} catch (e) {}
return fd;
};
15 changes: 13 additions & 2 deletions test/parallel/test-http2-respond-file-fd-invalid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const http2 = require('http2');

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

const {
NGHTTP2_INTERNAL_ERROR
Expand All @@ -18,7 +20,16 @@ const errorCheck = common.expectsError({

const server = http2.createServer();
server.on('stream', (stream) => {
stream.respondWithFD(common.firstInvalidFD());
let fd = 2;

// Get first known bad file descriptor.
try {
while (fs.fstatSync(++fd));
} catch (e) {
// do nothing; we now have an invalid fd
}

stream.respondWithFD(fd);
stream.on('error', common.mustCall(errorCheck));
});
server.listen(0, () => {
Expand Down