loadtest 7.1.1 → 8.0.0

package/test/integration.js

@@ -3,9 +3,9 @@ import {execFile} from 'child_process'
 import {join} from 'path'
 import {loadTest, startServer} from '../index.js'
 
-const PORT = 10408;
+const port = 10408;
 const serverOptions = {
-	port: PORT,
+	port,
 	quiet: true,
 }
 
@@ -19,7 +19,7 @@ function testIntegration(callback) {
 			return callback(error);
 		}
 		const options = {
-			url: 'http://localhost:' + PORT,
+			url: `http://localhost:${port}`,
 			maxRequests: 100,
 			concurrency: 10,
 			method: 'POST',
@@ -52,7 +52,7 @@ function testIntegrationFile(callback) {
 			return callback(error);
 		}
 		execFile('node',
-			[join('./', 'bin', 'loadtest.js'), `http://localhost:${PORT}/`,
+			[join('./', 'bin', 'loadtest.js'), `http://localhost:${port}/`,
 				'-n', '100', '--quiet'],
 			(error, stdout) => {
 				if (error) {
@@ -79,7 +79,7 @@ function testWSIntegration(callback) {
 			return callback(error);
 		}
 		const options = {
-			url: 'ws://localhost:' + PORT,
+			url: `ws://localhost:${port}`,
 			maxRequests: 10,
 			concurrency: 10,
 			body: {
@@ -113,7 +113,7 @@ function testWSIntegration(callback) {
 function testDelay(callback) {
 	const delay = 10;
 	const serverOptions = {
-		port: PORT + 1,
+		port: port + 1,
 		delay,
 		quiet: true,
 	};
@@ -122,7 +122,7 @@ function testDelay(callback) {
 			return callback(error);
 		}
 		const options = {
-			url: 'http://localhost:' + (PORT + 1),
+			url: 'http://localhost:' + (port + 1),
 			maxRequests: 10,
 			quiet: true,
 		};
@@ -145,7 +145,7 @@ function testDelay(callback) {
 async function testPromise() {
 	const server = await startServer(serverOptions)
 	const options = {
-		url: 'http://localhost:' + PORT,
+		url: `http://localhost:${port}`,
 		maxRequests: 100,
 		concurrency: 10,
 		method: 'POST',
@@ -174,7 +174,7 @@ async function testIndexParam() {
 	}
 	const server = await startServer({logger, ...serverOptions})
 	const options = {
-		url: `http://localhost:${PORT}/?param=index`,
+		url: `http://localhost:${port}/?param=index`,
 		maxRequests: 100,
 		concurrency: 10,
 		postBody: {
@@ -191,7 +191,7 @@ async function testStatusCallback() {
 	let calls = 0
 	const server = await startServer(serverOptions)
 	const options = {
-		url: `http://localhost:${PORT}/`,
+		url: `http://localhost:${port}/`,
 		maxRequests: 100,
 		concurrency: 10,
 		postBody: {
@@ -203,18 +203,53 @@ async function testStatusCallback() {
 			calls += 1
 		}
 	};
-	await loadTest(options)
+	const result = await loadTest(options)
+	testing.assertEquals(result.totalRequests, 100, 'Should have 100 requests')
 	testing.assertEquals(calls, 100, 'Should have 100 calls')
 	await server.close()
 }
 
+async function testTcpClient() {
+	const server = await startServer(serverOptions)
+	const options = {
+		url: `http://localhost:${port}`,
+		maxRequests: 100,
+		method: 'POST',
+		body: {
+			hi: 'there',
+		},
+		quiet: true,
+		tcp: true,
+	};
+	const result = await loadTest(options)
+	await server.close()
+	return 'Test result: ' + JSON.stringify(result)
+}
+
+async function testTcpNoServer() {
+	const options = {
+		url: `http://localhost:${port}`,
+		maxRequests: 100,
+		rps: 1000,
+		method: 'POST',
+		body: {
+			hi: 'there',
+		},
+		quiet: true,
+		tcp: true,
+	};
+	const result = await loadTest(options)
+	return 'Test result: ' + JSON.stringify(result)
+}
+
 /**
  * Run all tests.
  */
 export function test(callback) {
 	testing.run([
 		testIntegration, testIntegrationFile, testDelay, testWSIntegration,
-		testPromise, testIndexParam, testStatusCallback,
+		testPromise, testIndexParam, testStatusCallback, testTcpClient,
+		testTcpNoServer,
 	], 4000, callback);
 }
 

package/test/latency.js

@@ -2,14 +2,16 @@ import testing from 'testing'
 import {Latency} from '../lib/latency.js'
 
 
+const mockLoadTest = {running: true, checkStop: () => false, countClients: () => 0}
+
 /**
  * Test latency ids.
  */
 function testLatencyIds(callback) {
-	const latency = new Latency({});
-	const firstId = latency.start();
+	const latency = new Latency(mockLoadTest);
+	const firstId = latency.begin();
 	testing.assert(firstId, 'Invalid first latency id %s', firstId, callback);
-	const secondId = latency.start();
+	const secondId = latency.begin();
 	testing.assert(secondId, 'Invalid second latency id', callback);
 	testing.assert(firstId != secondId, 'Repeated latency ids', callback);
 	testing.success(callback);
@@ -23,21 +25,21 @@ function testLatencyRequests(callback) {
 		maxRequests: 10,
 	};
 	const errorCode = '500';
-	const latency = new Latency(options, (error, result) => {
-		testing.check(error, 'Could not compute latency', callback);
-		testing.assertEquals(result.totalRequests, 10, 'Invalid total requests', callback);
-		testing.assertEquals(result.totalErrors, 1, 'Invalid total errors', callback);
-		testing.assert(errorCode in result.errorCodes, 'Error code not found', callback);
-		testing.assertEquals(result.errorCodes[errorCode], 1, 'Should have one ' + errorCode, callback);
-		testing.success(callback);
-	});
-	let id;
+	const latency = new Latency({options, ...mockLoadTest})
 	for (let i = 0; i < 9; i++) {
-		id = latency.start();
+		const id = latency.begin();
 		latency.end(id);
 	}
-	id = latency.start();
+	const id = latency.begin();
 	latency.end(id, errorCode);
+	testing.assert(latency.shouldStop(), 'Should stop now', callback);
+	latency.stop()
+	const result = latency.getResult()
+	testing.assertEquals(result.totalRequests, 10, 'Invalid total requests', callback);
+	testing.assertEquals(result.totalErrors, 1, 'Invalid total errors', callback);
+	testing.assert(errorCode in result.errorCodes, 'Error code not found', callback);
+	testing.assertEquals(result.errorCodes[errorCode], 1, 'Should have one ' + errorCode, callback);
+	testing.success(callback);
 }
 
 /**
@@ -47,24 +49,26 @@ function testLatencyPercentiles(callback) {
 	const options = {
 		maxRequests: 10
 	};
-	const latency = new Latency(options, error => {
-		testing.check(error, 'Error while testing latency percentiles', callback);
-		const percentiles = latency.getResult().percentiles;
-
-		Object.keys(percentiles).forEach(percentile => {
-			testing.assert(percentiles[percentile] !== false, 'Empty percentile for %s', percentile, callback);
-		});
-
-		testing.success(percentiles, callback);
-	});
+	const latency = new Latency({options, ...mockLoadTest})
 	for (let ms = 1; ms <= 10; ms++) {
 		(function() {
-			const id = latency.start();
+			const id = latency.begin();
 			setTimeout(() => {
 				latency.end(id);
 			}, ms);
 		})();
 	}
+	setTimeout(() => {
+		testing.assert(latency.shouldStop(), 'Should stop now', callback);
+		latency.stop()
+		const percentiles = latency.getResult().percentiles;
+
+		Object.keys(percentiles).forEach(percentile => {
+			testing.assert(percentiles[percentile] !== false, 'Empty percentile for %s', percentile, callback);
+		});
+
+		testing.success(percentiles, callback);
+	}, 20)
 }
 
 /**

package/test/loadtest.js

@@ -4,7 +4,7 @@ import {loadTest} from '../lib/loadtest.js'
 
 function testMaxSeconds(callback) {
 	const options = {
-		url: 'http://localhost:7357/',
+		url: 'http://localhost:7358/',
 		maxSeconds: 0.1,
 		concurrency: 1,
 		quiet: true,
@@ -14,7 +14,7 @@ function testMaxSeconds(callback) {
 
 function testWSEcho(callback) {
 	const options = {
-		url: 'ws://localhost:7357/',
+		url: 'ws://localhost:7358/',
 		maxSeconds: 0.1,
 		concurrency: 1,
 		quiet: true,
@@ -24,7 +24,7 @@ function testWSEcho(callback) {
 
 function testIndexParam(callback) {
 	const options = {
-		url: 'http://localhost:7357/replace',
+		url: 'http://localhost:7358/replace',
 		concurrency:1,
 		maxSeconds: 0.1,
 		indexParam: "replace",
@@ -35,7 +35,7 @@ function testIndexParam(callback) {
 
 function testIndexParamWithBody(callback) {
 	const options = {
-		url: 'http://localhost:7357/replace',
+		url: 'http://localhost:7358/replace',
 		concurrency:1,
 		maxSeconds: 0.1,
 		indexParam: "replace",
@@ -47,7 +47,7 @@ function testIndexParamWithBody(callback) {
 
 function testIndexParamWithCallback(callback) {
 	const options = {
-		url: 'http://localhost:7357/replace',
+		url: 'http://localhost:7358/replace',
 		concurrency:1,
 		maxSeconds: 0.1,
 		indexParam: "replace",
@@ -62,7 +62,7 @@ function testIndexParamWithCallback(callback) {
 
 function testIndexParamWithCallbackAndBody(callback) {
 	const options = {
-		url: 'http://localhost:7357/replace',
+		url: 'http://localhost:7358/replace',
 		concurrency:1,
 		maxSeconds: 0.1,
 		body: '{"id": "replace"}',
@@ -95,7 +95,7 @@ function testError(callback) {
  */
 function testKeepAlive(callback) {
 	const options = {
-		url: 'http://localhost:7357/',
+		url: 'http://localhost:7358/',
 		maxSeconds: 0.1,
 		concurrency: 1,
 		quiet: true,

package/test/request-generator.js

@@ -2,16 +2,16 @@ import testing from 'testing'
 import {loadTest} from '../lib/loadtest.js'
 import {startServer} from '../lib/testserver.js'
 
-const PORT = 10453;
+const port = 10453;
 
 
 function testRequestGenerator(callback) {
-	const server = startServer({port: PORT, quiet: true}, error => {
+	const server = startServer({port, quiet: true}, error => {
 		if (error) {
 			return callback('Could not start test server');
 		}
 		const options = {
-			url: 'http://localhost:' + PORT,
+			url: `http://localhost:${port}`,
 			method: 'POST',
 			requestsPerSecond: 1000,
 			maxRequests: 100,

package/test/result.js

@@ -23,7 +23,7 @@ function testCombineResults(callback) {
 			totalRequests: 330,
 			totalErrors: 10,
 			startTimeMs: 1000 + index * 1000,
-			endTimeMs: 1000 + index * 2000,
+			stopTimeMs: 1000 + index * 2000,
 			accumulatedMs: 5000,
 			maxLatencyMs: 350 + index,
 			minLatencyMs: 2 + index,

package/test/tcpClient.js

@@ -0,0 +1,23 @@
+import testing from 'testing'
+import {TcpClient} from '../lib/tcpClient.js'
+
+
+function testHttpClient(callback) {
+	const options = {
+		url: 'http://localhost:7358/',
+		maxSeconds: 0.1,
+		concurrency: 1,
+	};
+	const client = new TcpClient({options});
+	client.stop()
+	testing.success(callback);
+}
+
+
+/**
+ * Run all tests.
+ */
+export function test(callback) {
+	testing.run([testHttpClient], callback)
+}
+

package/test/websocket.js

@@ -1,14 +1,14 @@
 import testing from 'testing'
-import {create} from '../lib/websocket.js'
+import {WebsocketClient} from '../lib/websocket.js'
 
 
 function testWebsocketClient(callback) {
 	const options = {
-		url: 'ws://localhost:7357/',
+		url: 'ws://localhost:7358/',
 		maxSeconds: 0.1,
 		concurrency: 1,
 	};
-	create({}, options);
+	new WebsocketClient({options});
 	testing.success(callback);
 }