redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-04 15:02:09 +03:00
Code Activity

run tests with redis 7 as well - copied from #2020 (#2062)

Browse Source 
* run tests on redis 7 as well - copied from #2020

* copy some changes from #2020

* clean BITCOUNT
This commit is contained in:
Leibale Eidelman
2022-03-30 08:12:21 -04:00
committed by GitHub
parent b0fb3bd63f
commit 33a3f3f6c6
7 changed files with 75 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/test-utils/lib/index.ts
View File

@@ -27,49 +27,61 @@ interface ClusterTestOptions<M extends RedisModules, S extends RedisScripts> ext
numberOfNodes?: number;
}
interface Version {
string: string;
numbers: Array<number>;
}
export default class TestUtils {
static #getVersion(argumentName: string, defaultVersion: string): Array<number> {
static #getVersion(argumentName: string, defaultVersion: string): Version {
return yargs(hideBin(process.argv))
.option(argumentName, {
type: 'string',
default: defaultVersion
})
.coerce(argumentName, (arg: string) => {
return arg.split('.').map(x => {
const value = Number(x);
if (Number.isNaN(value)) {
throw new TypeError(`${arg} is not a valid redis version`);
}
const indexOfDash = arg.indexOf('-');
return {
string: arg,
numbers: (indexOfDash === -1 ? arg : arg.substring(0, indexOfDash)).split('.').map(x => {
const value = Number(x);
if (Number.isNaN(value)) {
throw new TypeError(`${arg} is not a valid redis version`);
}
return value;
});
return value;
})
};
})
.demandOption(argumentName)
.parseSync()[argumentName];
}
readonly #VERSION_NUMBERS: Array<number>;
readonly #DOCKER_IMAGE: RedisServerDockerConfig;
constructor(config: TestUtilsConfig) {
const { string, numbers } = TestUtils.#getVersion(config.dockerImageVersionArgument, config.defaultDockerVersion);
this.#VERSION_NUMBERS = numbers;
this.#DOCKER_IMAGE = {
image: config.dockerImageName,
version: TestUtils.#getVersion(config.dockerImageVersionArgument, config.defaultDockerVersion)
version: string
};
}
isVersionGreaterThan(minimumVersion: Array<number> | undefined): boolean {
if (minimumVersion === undefined) return true;
const lastIndex = Math.min(this.#DOCKER_IMAGE.version.length, minimumVersion.length) - 1;
const lastIndex = Math.min(this.#VERSION_NUMBERS.length, minimumVersion.length) - 1;
for (let i = 0; i < lastIndex; i++) {
if (this.#DOCKER_IMAGE.version[i] > minimumVersion[i]) {
if (this.#VERSION_NUMBERS[i] > minimumVersion[i]) {
return true;
} else if (minimumVersion[i] > this.#DOCKER_IMAGE.version[i]) {
} else if (minimumVersion[i] > this.#VERSION_NUMBERS[i]) {
return false;
}
}
return this.#DOCKER_IMAGE.version[lastIndex] >= minimumVersion[lastIndex];
return this.#VERSION_NUMBERS[lastIndex] >= minimumVersion[lastIndex];
}
isVersionGreaterThanHook(minimumVersion: Array<number> | undefined): void {