tests (e2e): fix names in run_e2e script, following global name change.
This commit is contained in:
parent
fb310c104c
commit
debbdba8eb
1 changed files with 7 additions and 7 deletions
|
|
@ -158,19 +158,19 @@ def use_e2e_env():
|
|||
libervia_web_root_path = libervia_web_path.parent
|
||||
if (libervia_web_root_path / ".hg").is_dir():
|
||||
libervia_web_source = libervia_web_root_path
|
||||
libervia_web_target = "/src/libervia"
|
||||
libervia_web_target = "/src/libervia-web"
|
||||
else:
|
||||
libervia_web_source = libervia_web_path
|
||||
libervia_web_target = "/src/libervia/libervia"
|
||||
libervia_web_target = "/src/libervia-web/libervia"
|
||||
|
||||
sat_templates_path = Path(sat_templates.__file__).parent.resolve()
|
||||
sat_templates_root_path = sat_templates_path.parent
|
||||
if (sat_templates_root_path / ".hg").is_dir():
|
||||
sat_templates_source = sat_templates_root_path
|
||||
sat_templates_target = "/src/sat_templates"
|
||||
sat_templates_target = "/src/libervia-templates"
|
||||
else:
|
||||
sat_templates_source = sat_templates_path
|
||||
sat_templates_target = "/src/sat_templates/sat_templates"
|
||||
sat_templates_target = "/src/libervia-templates/sat_templates"
|
||||
|
||||
compose_e2e_path = docker_path / "docker-compose-e2e.yml"
|
||||
if not compose_e2e_path.is_file():
|
||||
|
|
@ -186,13 +186,13 @@ def use_e2e_env():
|
|||
volumes:
|
||||
- type: bind
|
||||
source: {backend_root_path}
|
||||
target: /src/sat
|
||||
target: /src/libervia-backend
|
||||
read_only: true
|
||||
web:
|
||||
volumes:
|
||||
- type: bind
|
||||
source: {backend_root_path}
|
||||
target: /src/sat
|
||||
target: /src/libervia-backend
|
||||
read_only: true
|
||||
- type: bind
|
||||
source: {libervia_web_source}
|
||||
|
|
@ -224,7 +224,7 @@ def use_e2e_env():
|
|||
docker_compose.up("-d")
|
||||
|
||||
p = docker_compose.exec(
|
||||
"-T", "--workdir", "/src/sat/tests", "backend",
|
||||
"-T", "--workdir", "/src/libervia-backend/tests", "backend",
|
||||
"pytest", "-o", "cache_dir=/tmp", *sys.argv[1:], color="yes",
|
||||
_in=sys.stdin, _out=live_out, _out_bufsize=0, _err=live_err, _err_bufsize=0,
|
||||
_bg=True
|
||||
|
|
|
|||
Loading…
Reference in a new issue