diff --git a/RLTest/env.py b/RLTest/env.py index 02510083..3c20df9f 100644 --- a/RLTest/env.py +++ b/RLTest/env.py @@ -452,7 +452,8 @@ def expect(self, *query, **options): return Query(self, *query, **options) def cmd(self, *query, **options): - res = self.con.execute_command(*query, **options) + conn = options.pop('conn', self.con) + res = conn.execute_command(*query, **options) self.debugPrint('query: %s, result: %s' % (repr(query), repr(res))) return res diff --git a/RLTest/redis_std.py b/RLTest/redis_std.py index 51b9f914..d0999f4a 100644 --- a/RLTest/redis_std.py +++ b/RLTest/redis_std.py @@ -332,6 +332,8 @@ def startEnv(self, masters = True, slaves = True): self.envIsUp = self.masterProcess is not None or self.slaveProcess is not None self.envIsHealthy = self.masterProcess is not None and (self.slaveProcess is not None if self.useSlaves else True) + if not self.envIsUp or not self.envIsHealthy: + raise Exception('Failed to start environment') def _isAlive(self, process): if not process: diff --git a/pyproject.toml b/pyproject.toml index 5036b15f..3fb2488e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "RLTest" -version = "0.5.12" +version = "0.5.13" description="Redis Labs Test Framework, allow to run tests on redis and modules on a variety of environments" authors = ["RedisLabs "] license = "BSD-3-Clause"