Loading gears before test - PR fixes

Author: alonre24

tests/flow/includes.py

@@ -14,7 +14,10 @@
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../opt/readies"))
 import paella
 
-ROOT = os.environ.get("ROOT")
+ROOT = os.environ.get("ROOT", None)
+if ROOT is None:
+    sys.stderr.write("ROOT was not defined in the environment.\n")
+    sys.exit(1)
 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

@@ -12,16 +12,18 @@ def wrapper(env, *args, **kwargs):
         modules = con.execute_command("MODULE", "LIST")
         if b'rg' in [module[1] for module in modules]:
             return f(env, *args, **kwargs)
+        platform = paella.Platform()
+        redisgears_dir = "{ROOT}/bin/{PLATFORM}/RedisGears".format(ROOT=ROOT, PLATFORM=platform.triplet())
+        if not os.path.isdir(redisgears_dir):
+            env.debugPrint("RedisGears directory does not exist", force=True)
+            return
+        redisgears_path = os.path.join(redisgears_dir, 'redisgears.so')
+        python_plugin_path = os.path.join(redisgears_dir, 'plugin/gears_python.so')
         try:
-            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', redisgears_dir)
             env.assertEqual(ret, b'OK')
-        except Exception as e:
-            env.debugPrint(str(e), force=True)
+        except Exception:
             env.debugPrint("skipping since RedisGears not loaded", force=True)
             return
         return f(env, *args, **kwargs)