Skip to content

test: refactor common.ddCommand() #23411

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 6 commits into from
Closed

test: refactor common.ddCommand() #23411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edf1a7c
test: refactor common.ddCommand()
Trott Oct 10, 2018
fd0eb95
fixup! test: refactor common.ddCommand()
Trott Oct 10, 2018
74bc7df
fixup! fixup! test: refactor common.ddCommand()
Trott Oct 10, 2018
d3d2bab
test: rename common.ddCommand()
Trott Oct 10, 2018
bf4f33c
fixup! fixup! fixup! test: refactor common.ddCommand()
Trott Oct 10, 2018
c1f684d
fixup! in module loader
refack Oct 10, 2018
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
5 changes: 2 additions & 3 deletions test/common/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ symlinks
([SeCreateSymbolicLinkPrivilege](https://msdn.microsoft.com/en-us/library/windows/desktop/bb530716(v=vs.85).aspx)).
On non-Windows platforms, this always returns `true`.

### ddCommand(filename, kilobytes)
* return [<Object>]
### ddCommand(filename)

Platform normalizes the `dd` command
Creates a 10Mb file of all null characters.
Copy link
Copy Markdown
Contributor

@vsemozhetbyt vsemozhetbyt Oct 10, 2018

Choose a reason for hiding this comment

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

Mb -> MB to not be confused with megabit?


### disableCrashOnUnhandledRejection()

Expand Down
12 changes: 4 additions & 8 deletions test/common/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const assert = require('assert');
const os = require('os');
const { exec, execSync, spawnSync } = require('child_process');
const util = require('util');
const { fixturesDir } = require('./fixtures');
const tmpdir = require('./tmpdir');
const {
bits,
Expand Down Expand Up @@ -174,13 +173,10 @@ function childShouldThrowAndAbort() {
});
}

function ddCommand(filename, kilobytes) {
if (isWindows) {
const p = path.resolve(fixturesDir, 'create-file.js');
return `"${process.argv[0]}" "${p}" "${filename}" ${kilobytes * 1024}`;
} else {
return `dd if=/dev/zero of="${filename}" bs=1024 count=${kilobytes}`;
}
function ddCommand(filename) {
Copy link
Copy Markdown
Contributor

@refack refack Oct 10, 2018

Choose a reason for hiding this comment

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

Then why not call it createZeroFilledFile?

Copy link
Copy Markdown
Member Author

@Trott Trott Oct 10, 2018

Choose a reason for hiding this comment

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

Because I'm lazy?

const fd = fs.openSync(filename, 'w');
fs.ftruncateSync(fd, 10240 * 1024);
Copy link
Copy Markdown
Member

@richardlau richardlau Oct 10, 2018

Choose a reason for hiding this comment

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

I think this should either be 10 * 1024 * 1024 (my preference) or 10485760.

fs.closeSync(fd);
}


Expand Down
29 changes: 0 additions & 29 deletions test/fixtures/create-file.js
View file
Open in desktop

This file was deleted.

43 changes: 20 additions & 23 deletions test/parallel/test-http-chunk-problem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,34 +63,31 @@ function executeRequest(cb) {

tmpdir.refresh();

const ddcmd = common.ddCommand(filename, 10240);
common.ddCommand(filename);

cp.exec(ddcmd, function(err, stdout, stderr) {
assert.ifError(err);
server = http.createServer(function(req, res) {
res.writeHead(200);
server = http.createServer(function(req, res) {
res.writeHead(200);

// Create the subprocess
const cat = cp.spawn('cat', [filename]);
// Create the subprocess
const cat = cp.spawn('cat', [filename]);

// Stream the data through to the response as binary chunks
cat.stdout.on('data', (data) => {
res.write(data);
});

cat.stdout.on('end', () => res.end());
// Stream the data through to the response as binary chunks
cat.stdout.on('data', (data) => {
res.write(data);
});

// End the response on exit (and log errors)
cat.on('exit', (code) => {
if (code !== 0) {
console.error(`subprocess exited with code ${code}`);
process.exit(1);
}
});
cat.stdout.on('end', () => res.end());

// End the response on exit (and log errors)
cat.on('exit', (code) => {
if (code !== 0) {
console.error(`subprocess exited with code ${code}`);
process.exit(1);
}
});

server.listen(0, () => {
executeRequest(() => server.close());
});
});

server.listen(0, () => {
executeRequest(() => server.close());
});
9 changes: 2 additions & 7 deletions test/parallel/test-pipe-file-to-http.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const assert = require('assert');
const fs = require('fs');
const http = require('http');
const path = require('path');
const cp = require('child_process');

const tmpdir = require('../common/tmpdir');
tmpdir.refresh();
Expand Down Expand Up @@ -57,12 +56,8 @@ const server = http.createServer(function(req, res) {
server.listen(0);

server.on('listening', function() {
const cmd = common.ddCommand(filename, 10240);

cp.exec(cmd, function(err) {
assert.ifError(err);
makeRequest();
});
common.ddCommand(filename);
makeRequest();
});

function makeRequest() {
Expand Down