allow passing startup grace (#247)

Author: JoanFM

RLTest/env.py

@@ -153,6 +153,7 @@ class Defaults:
     protocol = 2
     redis_config_file = None
     dualTLS = False
+    startup_grace_secs = 0.1
 
     def getKwargs(self):
         kwargs = {
@@ -201,7 +202,8 @@ def __init__(self, testName=None, testDescription=None, module=None,
                  tlsCaCertFile=None, tlsPassphrase=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None,
                  redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False, clusterNodeTimeout = None,
                  freshEnv=False, enableDebugCommand=None, enableModuleCommand=None, enableProtectedConfigs=None, protocol=None,
-                 terminateRetries=None, terminateRetrySecs=None, redisConfigFile=None, dualTLS=False):
+                 terminateRetries=None, terminateRetrySecs=None, redisConfigFile=None, dualTLS=False,
+                 startupGraceSecs=None):
 
         self.testName = testName if testName else Defaults.curr_test_name
         if self.testName is None:
@@ -255,6 +257,8 @@ def __init__(self, testName=None, testDescription=None, module=None,
 
         self.dualTLS = dualTLS if dualTLS else Defaults.dualTLS
 
+        self.startupGraceSecs = startupGraceSecs if startupGraceSecs is not None else Defaults.startup_grace_secs
+
         if not freshEnv and Env.RTestInstance and Env.RTestInstance.currEnv and self.compareEnvs(Env.RTestInstance.currEnv):
             self.envRunner = Env.RTestInstance.currEnv.envRunner
         else:
@@ -372,6 +376,7 @@ def getEnvKwargs(self):
             'terminateRetrySecs': self.terminateRetrySecs,
             'redisConfigFile': self.redisConfigFile,
             'dualTLS': self.dualTLS,
+            'startupGraceSecs': self.startupGraceSecs,
         }
         return kwargs
 

RLTest/redis_std.py

@@ -23,7 +23,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
                  useAof=False, useRdbPreamble=True, debugger=None, sanitizer=None, noCatch=False, noLog=False, unix=False, verbose=False, useTLS=False,
                  tlsCertFile=None, tlsKeyFile=None, tlsCaCertFile=None, clusterNodeTimeout=None, tlsPassphrase=None, enableDebugCommand=False, protocol=2,
                  terminateRetries=None, terminateRetrySecs=None, enableProtectedConfigs=False, enableModuleCommand=False, loglevel=None,
-                 redisConfigFile=None, dualTLS=False
+                 redisConfigFile=None, dualTLS=False, startupGraceSecs=0.1
                  ):
         self.uuid = uuid.uuid4().hex
         self.redisBinaryPath = os.path.expanduser(redisBinaryPath) if redisBinaryPath.startswith(
@@ -72,6 +72,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
         self.terminateRetrySecs = terminateRetrySecs
         self.redisConfigFile = redisConfigFile
         self.dualTLS = dualTLS
+        self.startupGraceSecs = startupGraceSecs
 
         if port > 0:
             self.port = port
@@ -381,7 +382,7 @@ def startEnv(self, masters = True, slaves = True):
         if masters and self.masterProcess is None:
             self.masterProcess = subprocess.Popen(args=self.masterCmdArgs, env=self.masterOSEnv, cwd=self.dbDirPath,
                                                   **options)
-            time.sleep(0.1)
+            time.sleep(self.startupGraceSecs)
             if self._isAlive(self.masterProcess):
                 con = self.getConnection()
                 self.waitForRedisToStart(con, self.masterProcess)
@@ -392,7 +393,7 @@ def startEnv(self, masters = True, slaves = True):
                 print(Colors.Green("Redis slave command: " + ' '.join(self.slaveCmdArgs)))
             self.slaveProcess = subprocess.Popen(args=self.slaveCmdArgs, env=self.slaveOSEnv, cwd=self.dbDirPath,
                                                  **options)
-            time.sleep(0.1)
+            time.sleep(self.startupGraceSecs)
             if self._isAlive(self.slaveProcess):
                 con = self.getSlaveConnection()
                 self.waitForRedisToStart(con, self.slaveProcess)