diff --git a/odoo_openupgrade_wizard/tools/tools_odoo_instance.py b/odoo_openupgrade_wizard/tools/tools_odoo_instance.py index 71d1b76..44be43f 100644 --- a/odoo_openupgrade_wizard/tools/tools_odoo_instance.py +++ b/odoo_openupgrade_wizard/tools/tools_odoo_instance.py @@ -6,6 +6,7 @@ from loguru import logger # Wait for the launch of odoo instance 60 seconds _ODOO_RPC_MAX_TRY = 60 +_ODOO_RPC_URL = "0.0.0.0" class OdooInstance: @@ -28,7 +29,7 @@ class OdooInstance: # Connection try: rpc_connexion = odoorpc.ODOO( - "0.0.0.0", + _ODOO_RPC_URL, "jsonrpc", port=port, timeout=ctx.obj["config"]["odoo_rpc_timeout"], diff --git a/tests/__init__.py b/tests/__init__.py index f82cdb7..0765cbc 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -81,3 +81,13 @@ def build_ctx_from_config_file() -> dict: ctx.obj["env_folder_path"] = env_folder_path ctx.obj["src_folder_path"] = env_folder_path / Path("src") return ctx + + +def mock_odoo_rpc_url(mocker): + """Mock the _ODOO_RPC_URL for testing purpose""" + odoo_rpc_url = os.environ.get("ODOO_RPC_URL") + if odoo_rpc_url: + mocker.patch( + "odoo_openupgrade_wizard.tools.tools_odoo_instance._ODOO_RPC_URL", + odoo_rpc_url, + ) diff --git a/tests/cli_20_install_from_csv_test.py b/tests/cli_20_install_from_csv_test.py index 8bc21fb..784f4c0 100644 --- a/tests/cli_20_install_from_csv_test.py +++ b/tests/cli_20_install_from_csv_test.py @@ -6,16 +6,19 @@ from odoo_openupgrade_wizard.tools.tools_postgres import ( from . import ( build_ctx_from_config_file, cli_runner_invoke, + mock_odoo_rpc_url, move_to_test_folder, ) -def test_cli_install_from_csv(): +def test_cli_install_from_csv(mocker): move_to_test_folder() + mock_odoo_rpc_url(mocker) # Initialize database db_name = "database_test_cli___install_from_csv" ctx = build_ctx_from_config_file() + ensure_database(ctx, db_name, state="absent") cli_runner_invoke( diff --git a/tests/cli_21_generate_module_analysis_test.py b/tests/cli_21_generate_module_analysis_test.py index 3280e66..e59fca6 100644 --- a/tests/cli_21_generate_module_analysis_test.py +++ b/tests/cli_21_generate_module_analysis_test.py @@ -5,12 +5,14 @@ from odoo_openupgrade_wizard.tools.tools_odoo import get_odoo_env_path from . import ( build_ctx_from_config_file, cli_runner_invoke, + mock_odoo_rpc_url, move_to_test_folder, ) -def test_cli_generate_module_analysis(): +def test_cli_generate_module_analysis(mocker): move_to_test_folder() + mock_odoo_rpc_url(mocker) ctx = build_ctx_from_config_file() db_name = "database_test_cli___generate_module_analysis" diff --git a/tests/cli_22_dumpdb_test.py b/tests/cli_22_dumpdb_test.py index f542bfd..b28e0fe 100644 --- a/tests/cli_22_dumpdb_test.py +++ b/tests/cli_22_dumpdb_test.py @@ -6,12 +6,14 @@ from odoo_openupgrade_wizard.tools.tools_postgres import ensure_database from . import ( build_ctx_from_config_file, cli_runner_invoke, + mock_odoo_rpc_url, move_to_test_folder, ) -def test_cli_dumpdb(): +def test_cli_dumpdb(mocker): move_to_test_folder() + mock_odoo_rpc_url(mocker) # Initialize database db_name = "database_test_cli___dumpdb" @@ -62,8 +64,9 @@ def test_cli_dumpdb(): filestore_path.unlink() -def test_cli_dumpdb_failure(): +def test_cli_dumpdb_failure(mocker): move_to_test_folder() + mock_odoo_rpc_url(mocker) # Initialize database db_name = "database_test_cli___dumpdb" diff --git a/tests/cli_31_copydb_test.py b/tests/cli_31_copydb_test.py index f9293b7..025c704 100644 --- a/tests/cli_31_copydb_test.py +++ b/tests/cli_31_copydb_test.py @@ -6,12 +6,14 @@ from odoo_openupgrade_wizard.tools.tools_postgres import ensure_database from . import ( build_ctx_from_config_file, cli_runner_invoke, + mock_odoo_rpc_url, move_to_test_folder, ) -def test_cli_copydb(): +def test_cli_copydb(mocker): move_to_test_folder() + mock_odoo_rpc_url(mocker) db_name = "database_test_cli___copydb" db_dest_name = "database_test_cli___copydb__copy"