test: update path, add-update utils

Author: Harry Le

engine/e2e-test/runner/cortex-llamacpp-e2e-nightly.py

@@ -16,21 +16,21 @@
 sys.path.append(os.path.join(PROJECT_ROOT, "cli/common"))  
 
 ### e2e tests are expensive, have to keep engines tests in order
-from api.engines.test_api_engine_list import TestApiEngineList
-from api.engines.test_api_engine_install_nightly import TestApiEngineInstall
-from api.model.test_api_model import TestApiModel
-from api.model.test_api_model_import import TestApiModelImport
+from test_api_get_list_engine import TestApiEngineList
+from test_api_engine_install_nightly import TestApiEngineInstall
+from test_api_model import TestApiModel
+from test_api_model_import import TestApiModelImport
 
 ###
-from cli.engines.test_cli_engine_get import TestCliEngineGet
-from cli.engines.test_cli_engine_install_nightly import TestCliEngineInstall
-from cli.engines.test_cli_engine_list import TestCliEngineList
-from cli.engines.test_cli_engine_uninstall import TestCliEngineUninstall
-from cli.model.test_cli_model import TestCliModel
-from cli.model.test_cli_model_import import TestCliModelImport
-from cli.common.test_cli_server_start import TestCliServerStart
-from cli.common.test_cortex_update import TestCortexUpdate
-from cli.common.test_create_log_folder import TestCreateLogFolder
+from test_cli_engine_get import TestCliEngineGet
+from test_cli_engine_install_nightly import TestCliEngineInstall
+from test_cli_engine_list import TestCliEngineList
+from test_cli_engine_uninstall import TestCliEngineUninstall
+from test_cli_model import TestCliModel
+from test_cli_model_import import TestCliModelImport
+from test_cli_server_start import TestCliServerStart
+from test_cortex_update import TestCortexUpdate
+from test_create_log_folder import TestCreateLogFolder
 
 if __name__ == "__main__":
     sys.exit(pytest.main([__file__, "-v"]))

engine/e2e-test/runner/main.py

@@ -16,21 +16,21 @@
 sys.path.append(os.path.join(PROJECT_ROOT, "cli/common"))  
 
 ### e2e tests are expensive, have to keep engines tests in order
-from api.engines.test_api_engine_list import TestApiEngineList
-from api.engines.test_api_engine import TestApiEngine
-from api.model.test_api_model import TestApiModel
-from api.model.test_api_model_import import TestApiModelImport
+from test_api_get_list_engine import TestApiEngineList
+from test_api_engine import TestApiEngine
+from test_api_model import TestApiModel
+from test_api_model_import import TestApiModelImport
 
 ###
-from cli.engines.test_cli_engine_get import TestCliEngineGet
-from cli.engines.test_cli_engine_install import TestCliEngineInstall
-from cli.engines.test_cli_engine_list import TestCliEngineList
-from cli.engines.test_cli_engine_uninstall import TestCliEngineUninstall
-from cli.model.test_cli_model import TestCliModel
-from cli.model.test_cli_model_import import TestCliModelImport
-from cli.common.test_cli_server_start import TestCliServerStart
-from cli.common.test_cortex_update import TestCortexUpdate
-from cli.common.test_create_log_folder import TestCreateLogFolder
+from test_cli_engine_get import TestCliEngineGet
+from test_cli_engine_install import TestCliEngineInstall
+from test_cli_engine_list import TestCliEngineList
+from test_cli_engine_uninstall import TestCliEngineUninstall
+from test_cli_model import TestCliModel
+from test_cli_model_import import TestCliModelImport
+from test_cli_server_start import TestCliServerStart
+from test_cortex_update import TestCortexUpdate
+from test_create_log_folder import TestCreateLogFolder
 
 if __name__ == "__main__":
     sys.exit(pytest.main([__file__, "-v"]))

…test_api_cortexso_hub_llamacpp_engine.py …test_api_cortexso_hub_llamacpp_engine.pyengine/e2e-test/api/hub/test_api_cortexso_hub_llamacpp_engine.py renamed to engine/e2e-test/test_api_cortexso_hub_llamacpp_engine.py engine/e2e-test/api/hub/test_api_cortexso_hub_llamacpp_engine.py renamed to engine/e2e-test/test_api_cortexso_hub_llamacpp_engine.py

@@ -0,0 +1,3 @@
+def assert_equal(actual, expected):
+    """Custom assertion to compare actual and expected values."""
+    assert actual == expected, f"Assertion failed: Expected {expected}, but got {actual}"

engine/e2e-test/utils/assertion.py

@@ -3,7 +3,7 @@
 
 def log_response(data, test_name):
     """Log the data to a file named after the test."""
-    log_dir="logs"
+    log_dir="e2e-test/logs"
     os.makedirs(log_dir, exist_ok=True)  # Ensure log directory exists
     file_path = os.path.join(log_dir, f"{test_name}.txt")  # Log file per test