check module version in tests (#106)

* check module version

* call MODULE LIST once

Author: ashtul

test/test.py

@@ -19,6 +19,8 @@
 
 TITLES_CSV = os.path.abspath(os.path.dirname(__file__)) + '/titles.csv'
 
+v = 0
+
 def waitForIndex(env, idx, timeout=None):
     delay = 0.1
     while True:
@@ -37,19 +39,11 @@ def waitForIndex(env, idx, timeout=None):
             if timeout <= 0:
                 break
 
-def check_version_2(env):
-    try:
-        # Indexing the hash
-        env.execute_command('FT.ADDHASH foo bar 1')
-    except redis.ResponseError as e:
-        # Support for FT.ADDHASH was removed in RediSearch 2.0
-        if str(e).startswith('unknown command `FT.ADDHASH`'):
-            return True
-        return False
-
-def check_edge(env):
-    v = env.execute_command('MODULE LIST')[0][3]
-    if v is "999999":
+def check_version(env, version):
+    global v
+    if v == 0:
+        v = env.execute_command('MODULE LIST')[0][3]
+    if int(v) >= version:
         return True
     return False
 
@@ -209,7 +203,7 @@ def testAddHash(self):
         conn = self.redis()
 
         with conn as r:
-            if check_version_2(r):
+            if check_version(r, 20000):
                 return
             # Creating a client with a given index name
             client = Client('idx', port=conn.port)
@@ -236,7 +230,7 @@ def testPayloads(self):
         conn = self.redis()
 
         with conn as r:
-            if not check_edge(r):
+            if not check_version(r, 20200):
                 return
             # Creating a client with a given index name
             client = Client('idx', port=conn.port)
@@ -574,7 +568,7 @@ def testSummarize(self):
     def testAlias(self):
         conn = self.redis()
         with conn as r:
-            if check_version_2(r):
+            if check_version(r, 20000):
 
                 index1 = Client('testAlias', port=conn.port)
                 index1.redis.flushdb()
@@ -810,7 +804,7 @@ def testGet(self):
 
     def testConfig(self):
         client = self.getCleanClient('idx')
-        if not check_edge(client.redis):
+        if not check_version(client.redis, 20200):
             return
         self.assertTrue(client.config_set('TIMEOUT', '100'))
         with self.assertRaises(redis.ResponseError) as error:
@@ -893,7 +887,7 @@ def testIndexDefiniontion(self):
 
         with conn as r:
             r.flushdb()
-            if not check_version_2(r):
+            if not check_version(r, 20000):
                 return
             client = Client('test', port=conn.port)
 
@@ -914,7 +908,7 @@ def testCreateClientDefiniontion(self):
 
         with conn as r:
             r.flushdb()
-            if not check_version_2(r):
+            if not check_version(r, 20000):
                 return
             client = Client('test', port=conn.port)