Skip to content

Commit a265d79

Browse files
committed
tests: merge all after functions into one
1 parent c70dbb4 commit a265d79

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

packages/test-utils/lib/dockers.ts

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,7 @@ async function dockerRemove(dockerId: string): Promise<void> {
134134
}
135135
}
136136

137-
after(() => {
138-
return Promise.all(
139-
[...RUNNING_SERVERS.values()].map(async dockerPromise =>
140-
await dockerRemove((await dockerPromise).dockerId)
141-
)
142-
);
143-
});
137+
144138

145139
export type RedisClusterDockersConfig = RedisServerDockerOptions & {
146140
numberOfMasters?: number;
@@ -311,15 +305,7 @@ export function spawnRedisCluster(
311305
return dockersPromise;
312306
}
313307

314-
after(() => {
315-
return Promise.all(
316-
[...RUNNING_CLUSTERS.values()].map(async dockersPromise => {
317-
return Promise.all(
318-
(await dockersPromise).map(({ dockerId }) => dockerRemove(dockerId))
319-
);
320-
})
321-
);
322-
});
308+
323309

324310

325311
const RUNNING_NODES = new Map<Array<string>, Array<RedisServerDocker>>();
@@ -397,13 +383,20 @@ export async function spawnRedisSentinel(
397383
}
398384

399385
after(() => {
400-
return Promise.all(
401-
[...RUNNING_NODES.values(), ...RUNNING_SENTINELS.values()].map(async dockersPromise => {
402-
return Promise.all(
403-
dockersPromise.map(({ dockerId }) => dockerRemove(dockerId))
404-
);
405-
})
406-
);
386+
return Promise.all([
387+
...Array.from(RUNNING_SERVERS.values()).map(async dockerPromise =>
388+
dockerRemove((await dockerPromise).dockerId)
389+
),
390+
...Array.from(RUNNING_CLUSTERS.values()).map(async dockersPromise =>
391+
Promise.all((await dockersPromise).map(({ dockerId }) => dockerRemove(dockerId)))
392+
),
393+
...Array.from(RUNNING_NODES.values()).map(dockersPromise =>
394+
Promise.all(dockersPromise.map(({ dockerId }) => dockerRemove(dockerId)))
395+
),
396+
...Array.from(RUNNING_SENTINELS.values()).map(dockersPromise =>
397+
Promise.all(dockersPromise.map(({ dockerId }) => dockerRemove(dockerId)))
398+
),
399+
]);
407400
});
408401

409402

0 commit comments

Comments
 (0)