From de258230f87741cf18e10eca1a68cc5fd2c741fd Mon Sep 17 00:00:00 2001 From: "meir@redislabs.com" Date: Sat, 20 Mar 2021 17:32:55 +0200 Subject: [PATCH 1/2] allow override module args --- RLTest/env.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/RLTest/env.py b/RLTest/env.py index ed071756..186cd786 100644 --- a/RLTest/env.py +++ b/RLTest/env.py @@ -160,7 +160,7 @@ def compareEnvs(self, env): return True def __init__(self, testName=None, testDescription=None, module=None, - moduleArgs=None, env=None, useSlaves=None, shardsCount=None, decodeResponses=None, + moduleArgs=None, overideModuleArgs=None, env=None, useSlaves=None, shardsCount=None, decodeResponses=None, useAof=None, forceTcp=False, useTLS=False, tlsCertFile=None, tlsKeyFile=None, tlsCaCertFile=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None, redisEnterpriseBinaryPath=None): @@ -172,18 +172,21 @@ def __init__(self, testName=None, testDescription=None, module=None, print(Colors.Gray('\tdescription: ' + testDescription)) self.module = module if module else Defaults.module - self.moduleArgs = copy.deepcopy(Defaults.module_args) - if moduleArgs: - if self.moduleArgs is None or len(self.moduleArgs) == 0: - self.moduleArgs = [''] - argsToAdd = moduleArgs.split(' ') - for i in range(0, len(argsToAdd) - 1, 2): - # join module args - if argsToAdd[i] not in self.moduleArgs[0]: - self.moduleArgs[0] += ' %s %s' % (argsToAdd[i], argsToAdd[i + 1]) - if self.moduleArgs is not None: - for i in range(0, len(self.moduleArgs)): - self.moduleArgs[i] = self.moduleArgs[i].strip() + if(overideModuleArgs): + self.moduleArgs = copy.deepcopy(overideModuleArgs) + else: + self.moduleArgs = copy.deepcopy(Defaults.module_args) + if moduleArgs: + if self.moduleArgs is None or len(self.moduleArgs) == 0: + self.moduleArgs = [''] + argsToAdd = moduleArgs.split(' ') + for i in range(0, len(argsToAdd) - 1, 2): + # join module args + if argsToAdd[i] not in self.moduleArgs[0]: + self.moduleArgs[0] += ' %s %s' % (argsToAdd[i], argsToAdd[i + 1]) + if self.moduleArgs is not None: + for i in range(0, len(self.moduleArgs)): + self.moduleArgs[i] = self.moduleArgs[i].strip() self.env = env if env else Defaults.env self.useSlaves = useSlaves if useSlaves else Defaults.use_slaves self.shardsCount = shardsCount if shardsCount else Defaults.num_shards From 88020bb9cbbd9bb73f2ffb72ba4e80eee8e34ca0 Mon Sep 17 00:00:00 2001 From: "meir@redislabs.com" Date: Sat, 20 Mar 2021 17:36:24 +0200 Subject: [PATCH 2/2] small fix --- RLTest/env.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RLTest/env.py b/RLTest/env.py index 186cd786..75b6707a 100644 --- a/RLTest/env.py +++ b/RLTest/env.py @@ -160,7 +160,7 @@ def compareEnvs(self, env): return True def __init__(self, testName=None, testDescription=None, module=None, - moduleArgs=None, overideModuleArgs=None, env=None, useSlaves=None, shardsCount=None, decodeResponses=None, + moduleArgs=None, overrideModuleArgs=None, env=None, useSlaves=None, shardsCount=None, decodeResponses=None, useAof=None, forceTcp=False, useTLS=False, tlsCertFile=None, tlsKeyFile=None, tlsCaCertFile=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None, redisEnterpriseBinaryPath=None): @@ -172,8 +172,8 @@ def __init__(self, testName=None, testDescription=None, module=None, print(Colors.Gray('\tdescription: ' + testDescription)) self.module = module if module else Defaults.module - if(overideModuleArgs): - self.moduleArgs = copy.deepcopy(overideModuleArgs) + if overrideModuleArgs: + self.moduleArgs = copy.deepcopy(overrideModuleArgs) else: self.moduleArgs = copy.deepcopy(Defaults.module_args) if moduleArgs: