Set RedisGears path for redis gears tests

Author: alonre24

tests/flow/includes.py

@@ -10,12 +10,11 @@
 from skimage.io import imread
 from skimage.transform import resize
 
-try:
-    sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../deps/readies"))
-    import paella
-except:
-    pass
 
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../opt/readies"))
+import paella
+
+ROOT = os.environ.get("ROOT")
 MAX_ITERATIONS = 2 if os.environ.get("MAX_ITERATIONS") == None else os.environ.get("MAX_ITERATIONS")
 TEST_TF = os.environ.get("TEST_TF") != "0" and os.environ.get("WITH_TF") != "0"
 TEST_TFLITE = os.environ.get("TEST_TFLITE") != "0" and os.environ.get("WITH_TFLITE") != "0"

tests/flow/tests_withGears.py

@@ -13,11 +13,12 @@ def wrapper(env, *args, **kwargs):
         if b'rg' in [module[1] for module in modules]:
             return f(env, *args, **kwargs)
         try:
-            redisgears_path = os.path.join(os.path.dirname(__file__), 'bin/RedisGears/redisgears.so')
-            python_plugin_path = os.path.join(os.path.dirname(__file__), 'bin/RedisGears/plugin/gears_python.so')
-            python_env_path = os.path.join(os.path.dirname(__file__), 'bin/RedisGears')
+            platform = paella.Platform()
+            redisgears_dir = "{ROOT}/bin/{PLATFORM}/RedisGears".format(ROOT=ROOT, PLATFORM=platform.triplet())
+            redisgears_path = os.path.join(redisgears_dir, 'redisgears.so')
+            python_plugin_path = os.path.join(redisgears_dir, 'plugin/gears_python.so')
             ret = con.execute_command('MODULE', 'LOAD', redisgears_path, 'Plugin', python_plugin_path, 'CreateVenv',
-                                      0, 'PythonInstallationDir', python_env_path)
+                                      0, 'PythonInstallationDir', redisgears_dir)
             env.assertEqual(ret, b'OK')
         except Exception as e:
             env.debugPrint(str(e), force=True)
@@ -44,7 +45,7 @@ def ping(record):
 
 
 @skip_if_gears_not_loaded
-def ntest_model_run(env):
+def test_model_run(env):
     script = '''
 
 import redisAI
@@ -119,7 +120,7 @@ async def ModelRun_AsyncRunError(record):
 
 
 @skip_if_gears_not_loaded
-def ntest_script_run(env):
+def test_script_run(env):
     script = '''
 
 import redisAI
@@ -198,7 +199,7 @@ async def ScriptRun_AsyncRunError(record):
 
 
 @skip_if_gears_not_loaded
-def ntest_DAG_run_via_gears(env):
+def test_DAG_run_via_gears(env):
     script = '''
 
 import redisAI
@@ -322,3 +323,4 @@ async def DAGRun_addOpsFromString(record):
 
     values = con.execute_command('AI.TENSORGET', 'test5_res{1}', 'VALUES')
     env.assertEqual(values, [b'4', b'9', b'4', b'9'])
+