Fix error from #178 + v0.5.9 (#182)

* Fix error from #178 + v0.5.9

* fixes 1

* fixes 2

RLTest/env.py

@@ -447,15 +447,11 @@ def assertIsInstance(self, value, instance, depth=0):
     def assertAlmostEqual(self, value1, value2, delta, depth=0, message=None):
         self._assertion('%s almost equels %s (delta %s)' % (repr(value1), repr(value2), repr(delta)), abs(value1 - value2) <= delta, depth, message)
 
-    def expect(self, *query, **kwargs):
-        conn = kwargs.pop('conn', None)
-        return Query(self, conn=conn, *query)
-
-    def cmd(self, *query, **kwargs):
-        conn = kwargs.pop('conn', None)
-        if conn is None:
-            conn = self.con
-        res = conn.execute_command(*query)
+    def expect(self, *query, **options):
+        return Query(self, *query, **options)
+
+    def cmd(self, *query, **options):
+        res = self.con.execute_command(*query, **options)
         self.debugPrint('query: %s, result: %s' % (repr(query), repr(res)))
         return res
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "RLTest"
-version = "0.5.8"
+version = "0.5.9"
 description="Redis Labs Test Framework, allow to run tests on redis and modules on a variety of environments"
 authors = ["RedisLabs <[email protected]>"]
 license = "BSD-3-Clause"