fix: some unit tests

jsdelivr · Jan 30, 2025 · 1d366f2 · 1d366f2
1 parent 32e12d2
commit 1d366f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/measurement/store.ts b/src/measurement/store.ts
@@ -73,9 +73,10 @@ export class MeasurementStore {
 			results,
 		};
 		const measurementWithoutDefaults = this.removeDefaults(measurement, request);
+		const testsToProbes = Object.fromEntries(Array.from(onlineProbesMap, ([ testId, probe ]) => [ `${id}_${testId}`, probe.uuid ]));
 
 		await Promise.all([
-			this.redis.hSet('gp:test-to-probe', Object.fromEntries(Array.from(onlineProbesMap, ([ testId, probe ]) => [ `${id}_${testId}`, probe.uuid ]))),
+			!_.isEmpty(testsToProbes) && this.redis.hSet('gp:test-to-probe', testsToProbes),
 			this.redis.hSet('gp:in-progress', id, startTime.getTime()),
 			this.redis.set(getMeasurementKey(id, 'probes_awaiting'), onlineProbesMap.size, { EX: probesAwaitingTtl }),
 			this.redis.json.set(key, '$', measurementWithoutDefaults),

diff --git a/test/tests/integration/measurement/create-measurement.test.ts b/test/tests/integration/measurement/create-measurement.test.ts
@@ -634,7 +634,6 @@ describe('Create measurement', () => {
 					.send({
 						type: 'ping',
 						target: 'example.com',
-						limit: 2,
 						locations: [{
 							continent: 'NA',
 						}],
@@ -666,7 +665,6 @@ describe('Create measurement', () => {
 				await requestAgent.get(`/v1/measurements/${id2}`)
 					.expect(200)
 					.expect((response) => {
-						expect(response.body.limit).to.equal(2);
 						expect(response.body.locations).to.deep.equal([{ continent: 'NA' }]);
 						expect(response.body.results[0].result.status).to.equal('offline');
 						expect(response.body.results[0].result.rawOutput).to.equal('This probe is currently offline. Please try again later.');

diff --git a/test/tests/unit/measurement/store.test.ts b/test/tests/unit/measurement/store.test.ts
@@ -8,6 +8,7 @@ import type { PingResult } from '../../../../src/measurement/types.js';
 
 const getProbe = (id: string, ip: string) => ({
 	ipAddress: ip,
+	uuid: `${id}-${id}-${id}-${id}-${id}`,
 	altIpAddresses: [],
 	location: {
 		network: id,
@@ -149,8 +150,16 @@ describe('measurement store', () => {
 			[ getProbe('z', '1.1.1.1'), getProbe('10', '2.2.2.2'), getProbe('x', '3.3.3.3'), getProbe('0', '4.4.4.4') ],
 		);
 
-		expect(redisMock.hSet.callCount).to.equal(1);
-		expect(redisMock.hSet.args[0]).to.deep.equal([ 'gp:in-progress', 'measurementid', now ]);
+		expect(redisMock.hSet.callCount).to.equal(2);
+
+		expect(redisMock.hSet.args[0]).to.deep.equal([ 'gp:test-to-probe', {
+			measurementid_0: 'z-z-z-z-z',
+			measurementid_1: '10-10-10-10-10',
+			measurementid_2: 'x-x-x-x-x',
+			measurementid_3: '0-0-0-0-0',
+		}]);
+
+		expect(redisMock.hSet.args[1]).to.deep.equal([ 'gp:in-progress', 'measurementid', now ]);
 		expect(redisMock.set.callCount).to.equal(1);
 		expect(redisMock.set.args[0]).to.deep.equal([ 'gp:m:{measurementid}:probes_awaiting', 4, { EX: 35 }]);
 		expect(redisMock.json.set.callCount).to.equal(2);