Skip to content

Commit ab31e4a

Browse files
committed
churn(test): use redislabs/client-libs-test for testing
1 parent 4bca10f commit ab31e4a

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
node-version: ['18', '20', '22']
25-
redis-version: [ 'rs-7.4.0-v1', '8.0-M04-pre']
24+
node-version: [ '18', '20', '22' ]
25+
redis-version: [ 'rs-7.2.0-v13', 'rs-7.4.0-v1', '8.0-M04-pre' ]
2626
steps:
2727
- uses: actions/checkout@v4
2828
with:

packages/bloom/lib/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import RedisBloomModules from '.';
33

44
export default new TestUtils({
55
dockerImageName: 'redislabs/client-libs-test',
6-
dockerImageVersionArgument: 'redisbloom-version',
6+
dockerImageVersionArgument: 'redis-version',
77
defaultDockerVersion: '8.0-M04-pre'
88
});
99

packages/graph/lib/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import RedisGraph from '.';
44

55
export default new TestUtils({
66
dockerImageName: 'redislabs/client-libs-test',
7-
dockerImageVersionArgument: 'redisgraph-version',
7+
dockerImageVersionArgument: 'redis-version',
88
defaultDockerVersion: '8.0-M04-pre'
99
});
1010

packages/json/lib/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import RedisJSON from '.';
33

44
export default new TestUtils({
55
dockerImageName: 'redislabs/client-libs-test',
6-
dockerImageVersionArgument: 'redisgraph-version',
6+
dockerImageVersionArgument: 'redis-version',
77
defaultDockerVersion: '8.0-M04-pre'
88
});
99

packages/search/lib/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import RediSearch from '.';
33

44
export default new TestUtils({
55
dockerImageName: 'redislabs/client-libs-test',
6-
dockerImageVersionArgument: 'redisearch-version',
6+
dockerImageVersionArgument: 'redis-version',
77
defaultDockerVersion: '8.0-M04-pre'
88
});
99

packages/test-utils/lib/dockers.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { setTimeout } from 'node:timers/promises';
66
// import { ClusterSlotsReply } from '@redis/client/dist/lib/commands/CLUSTER_SLOTS';
77
import { promisify } from 'node:util';
88
import { exec } from 'node:child_process';
9+
910
const execAsync = promisify(exec);
1011

1112
interface ErrorWithCode extends Error {
@@ -135,10 +136,10 @@ async function spawnRedisClusterNodeDockers(
135136
'5000'
136137
], clientConfig).then(async replica => {
137138

138-
const requirePassIndex = serverArguments.findIndex((x)=>x==='--requirepass');
139-
if(requirePassIndex!==-1) {
140-
const password = serverArguments[requirePassIndex+1];
141-
await replica.client.configSet({'masterauth': password})
139+
const requirePassIndex = serverArguments.findIndex((x) => x === '--requirepass');
140+
if (requirePassIndex !== -1) {
141+
const password = serverArguments[requirePassIndex + 1];
142+
await replica.client.configSet({ 'masterauth': password })
142143
}
143144
await replica.client.clusterMeet('127.0.0.1', master.docker.port);
144145

@@ -227,7 +228,7 @@ async function spawnRedisClusterDockers(
227228
while (
228229
totalNodes(await client.clusterSlots()) !== nodes.length ||
229230
!(await client.sendCommand<string>(['CLUSTER', 'INFO'])).startsWith('cluster_state:ok') // TODO
230-
) {
231+
) {
231232
await setTimeout(50);
232233
}
233234

@@ -260,7 +261,7 @@ export function spawnRedisCluster(
260261
return runningCluster;
261262
}
262263

263-
const dockersPromise = spawnRedisClusterDockers(dockersConfig, serverArguments,clientConfig);
264+
const dockersPromise = spawnRedisClusterDockers(dockersConfig, serverArguments, clientConfig);
264265

265266
RUNNING_CLUSTERS.set(serverArguments, dockersPromise);
266267
return dockersPromise;

packages/time-series/lib/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import TimeSeries from '.';
33

44
export default new TestUtils({
55
dockerImageName: 'redislabs/client-libs-test',
6-
dockerImageVersionArgument: 'timeseries-version',
6+
dockerImageVersionArgument: 'redis-version',
77
defaultDockerVersion: '8.0-M04-pre'
88
});
99

0 commit comments

Comments
 (0)