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.

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: refactor the code of test-keep-alive.js #10684

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
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
30 changes: 15 additions & 15 deletions test/pummel/test-keep-alive.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ if (common.isWindows) {
return;
}

var body = 'hello world\n';
var server = http.createServer(function(req, res) {
const body = 'hello world\n';
const server = http.createServer(function(req, res) {
res.writeHead(200, {
'Content-Length': body.length,
'Content-Type': 'text/plain'
Expand All @@ -22,12 +22,12 @@ var server = http.createServer(function(req, res) {
res.end();
});

var keepAliveReqSec = 0;
var normalReqSec = 0;
let keepAliveReqSec = 0;
let normalReqSec = 0;


function runAb(opts, callback) {
var args = [
const args = [
'-c', opts.concurrent || 100,
'-t', opts.threads || 2,
'-d', opts.duration || '10s',
Expand All @@ -43,11 +43,11 @@ function runAb(opts, callback) {

//console.log(comm, args.join(' '));

var child = spawn('wrk', args);
const child = spawn('wrk', args);
child.stderr.pipe(process.stderr);
child.stdout.setEncoding('utf8');

var stdout;
let stdout;

child.stdout.on('data', function(data) {
stdout += data;
Expand All @@ -60,11 +60,11 @@ function runAb(opts, callback) {
return;
}

var matches = /Requests\/sec:\s*(\d+)\./mi.exec(stdout);
var reqSec = parseInt(matches[1]);
let matches = /Requests\/sec:\s*(\d+)\./mi.exec(stdout);
const reqSec = parseInt(matches[1]);

matches = /Keep-Alive requests:\s*(\d+)/mi.exec(stdout);
var keepAliveRequests;
let keepAliveRequests;
if (matches) {
keepAliveRequests = parseInt(matches[1]);
} else {
Expand All @@ -75,8 +75,8 @@ function runAb(opts, callback) {
});
}

server.listen(common.PORT, function() {
runAb({ keepalive: true }, function(reqSec) {
server.listen(common.PORT, () => {
runAb({ keepalive: true }, (reqSec) => {
keepAliveReqSec = reqSec;
console.log('keep-alive:', keepAliveReqSec, 'req/sec');
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can remove all the console.logs and the commented console.log in this file.


Expand All @@ -89,7 +89,7 @@ server.listen(common.PORT, function() {
});

process.on('exit', function() {
assert.equal(true, normalReqSec > 50);
assert.equal(true, keepAliveReqSec > 50);
assert.equal(true, normalReqSec < keepAliveReqSec);
assert.strictEqual(true, normalReqSec > 50);
assert.strictEqual(true, keepAliveReqSec > 50);
assert.strictEqual(true, normalReqSec < keepAliveReqSec);
});