Add password as a parameter for Env - [MOD-6117] (#208)

* added password as a parameter for Env

* added a test

Author: GuyAv46

RLTest/env.py

@@ -182,7 +182,7 @@ class Env:
     RTestInstance = None
     EnvCompareParams = ['module', 'moduleArgs', 'env', 'useSlaves', 'shardsCount', 'useAof',
                         'useRdbPreamble', 'forceTcp', 'enableDebugCommand', 'enableProtectedConfigs',
-                        'enableModuleCommand', 'protocol']
+                        'enableModuleCommand', 'protocol', 'password']
 
     def compareEnvs(self, env):
         if env is None:
@@ -193,7 +193,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, env=None, useSlaves=None, shardsCount=None, decodeResponses=None, password=None,
                  useAof=None, useRdbPreamble=None, forceTcp=False, useTLS=False, tlsCertFile=None, tlsKeyFile=None,
                  tlsCaCertFile=None, tlsPassphrase=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None,
                  redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False, clusterNodeTimeout = None,
@@ -222,6 +222,7 @@ def __init__(self, testName=None, testDescription=None, module=None,
         self.verbose = Defaults.verbose
         self.logDir = logDir if logDir else Defaults.logdir
         self.forceTcp = forceTcp
+        self.password = password
         self.debugger = Defaults.debugger
         self.sanitizer = Defaults.sanitizer
         self.useTLS = useTLS if useTLS else Defaults.use_TLS
@@ -289,7 +290,7 @@ def getEnvByName(self):
 
         if self.env == 'oss':
             kwargs.update(single_args)
-            kwargs['password'] = Defaults.oss_password
+            kwargs['password'] = Defaults.oss_password if self.password is None else self.password
             return StandardEnv(redisBinaryPath=self.redisBinaryPath,
                                outputFilesFormat='%s-' + '%s-oss' % test_fname,
                                **kwargs)
@@ -307,7 +308,7 @@ def getEnvByName(self):
                                         dmcBinaryPath=Defaults.proxy_binary,
                                         **kwargs)
         if self.env == 'oss-cluster':
-            kwargs['password'] = Defaults.oss_password
+            kwargs['password'] = Defaults.oss_password if self.password is None else self.password
             return ClusterEnv(shardsCount=self.shardsCount, redisBinaryPath=self.redisBinaryPath,
                               outputFilesFormat='%s-' + '%s-oss-cluster' % test_fname,
                               randomizePorts=Defaults.randomize_ports,

tests/unit/test_env.py

@@ -3,6 +3,7 @@
 from unittest import TestCase
 
 from RLTest import Env
+from RLTest.redis_cluster import ClusterEnv
 from tests.unit.test_common import REDIS_BINARY
 
 
@@ -221,3 +222,19 @@ def test_skip_on_unix_socket(self):
 
     def test_skip_on_enterprise_cluster(self):
         pass
+
+    def test_with_password(self):
+        password = 'GoodPassword42'
+        self.env = Env(useSlaves=True, env='oss', password=password, logDir=self.test_dir, redisBinaryPath=REDIS_BINARY)
+        assert self.env.envRunner.getPassword() == password
+        conn = self.env.getConnection()
+        assert conn.ping() == True
+        self.env.stop()
+        assert self.env.isUp() == False
+        self.env = Env(useSlaves=True, env='oss-cluster', password=password, logDir=self.test_dir, redisBinaryPath=REDIS_BINARY)
+        assert isinstance(self.env.envRunner, ClusterEnv)
+        assert self.env.envRunner.password == password
+        conn = self.env.getConnection()
+        assert conn.ping() == True
+        self.env.stop()
+        assert self.env.isUp() == False