Skip to content

Commit d022f96

Browse files
committed
fix: pytest with docker
1 parent d469268 commit d022f96

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ A lightweight image for running Odoo from 6.0 to the moon! Strongly inspired by
2424
- Strong use of virtual environments (using UV in 14.0+)
2525
- [click-odoo-contrib](https://github.com/acsone/click-odoo-contrib)
2626
- [git-aggregator](https://github.com/acsone/git-aggregator)
27+
- Compatible with podman (using --format docker)
2728

2829
## :page_facing_up: Documentation
2930

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def _get_preferred_client_type():
121121
if shutil.which("podman"):
122122
return "podman"
123123
if shutil.which("docker"):
124-
return None
124+
return "docker"
125125
raise RuntimeError("Need install podman or docker (with compose)")
126126

127127

@@ -174,7 +174,7 @@ def docker_env(env_info):
174174
os.environ["PYTEST_ODOO_VERSION"] = odoo_ver
175175
os.environ["PYTEST_PG_VERSION"] = PG_VERSIONS[odoo_ver]
176176
client_type = env_info["client_type"]
177-
client_call = [client_type] if client_type else None
177+
client_call = [client_type]
178178
# isOdoo Base
179179
if client_type == "podman":
180180
os.environ["PODMAN_COMPOSE_PROVIDER"] = "/usr/bin/podman-compose"

0 commit comments

Comments
 (0)