Skip to content

Commit 1b2913c

Browse files
committed
fix: tests
1 parent 5e59dc4 commit 1b2913c

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

tests/data/project_demo/docker-compose.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ services:
3535
dbnet:
3636
environment:
3737
OCONF_log_level: debug
38-
OCONF_log_handler: odoo:DEBUG,:DEBUG
3938
OCONF_db_filter: odoodb$
4039
OCONF_db_user: odoo
4140
OCONF_db_password: odoo

tests/test_isodoo.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,21 @@ def test_odoo_extra_addons(self, exec_docker, env_info):
100100
assert repo_info and "cannot access" not in repo_info
101101
assert addon_info[1] in repo_info
102102

103-
def test_odoo_private_addons(self, exec_docker, install_module):
103+
def test_odoo_private_addons(self, exec_docker, install_module, env_info):
104+
odoo_ver = env_info["options"]["odoo_version"]
105+
odoo_major_ver = int(odoo_ver.split(".", 1)[0])
104106
addons_info = exec_docker("odoo", ["ls", "/var/lib/odoo/private"])
105107
assert addons_info and "cannot access" not in addons_info
106108
assert "demo_addon" in addons_info
107109
addons_info = install_module("invented1234")
108110
assert "ignored: invented1234" in addons_info
109111
addons_info = install_module("demo_addon")
110-
assert "demo_addon loaded" in addons_info
112+
check_msg = (
113+
"demo_addon: creating or updating"
114+
if odoo_major_ver < 14
115+
else "demo_addon loaded"
116+
)
117+
assert check_msg in addons_info
111118

112119
def test_odoo_config(self, exec_docker):
113120
config_info = exec_docker("odoo", ["cat", "/etc/odoo/odoo.conf"])

0 commit comments

Comments
 (0)