comparison tests/e2e/run_e2e.py @ 3656:015e13f88960

tests (e2e): fix names in `run_e2e` script, following global name change.
author Goffi <goffi@goffi.org>
date Wed, 08 Sep 2021 11:17:34 +0200
parents 8ee0140cc8b6
children 0661b2aac167
comparison
equal deleted inserted replaced
3655:ca980569318c 3656:015e13f88960
156 156
157 libervia_web_path = Path(libervia.__file__).parent.resolve() 157 libervia_web_path = Path(libervia.__file__).parent.resolve()
158 libervia_web_root_path = libervia_web_path.parent 158 libervia_web_root_path = libervia_web_path.parent
159 if (libervia_web_root_path / ".hg").is_dir(): 159 if (libervia_web_root_path / ".hg").is_dir():
160 libervia_web_source = libervia_web_root_path 160 libervia_web_source = libervia_web_root_path
161 libervia_web_target = "/src/libervia" 161 libervia_web_target = "/src/libervia-web"
162 else: 162 else:
163 libervia_web_source = libervia_web_path 163 libervia_web_source = libervia_web_path
164 libervia_web_target = "/src/libervia/libervia" 164 libervia_web_target = "/src/libervia-web/libervia"
165 165
166 sat_templates_path = Path(sat_templates.__file__).parent.resolve() 166 sat_templates_path = Path(sat_templates.__file__).parent.resolve()
167 sat_templates_root_path = sat_templates_path.parent 167 sat_templates_root_path = sat_templates_path.parent
168 if (sat_templates_root_path / ".hg").is_dir(): 168 if (sat_templates_root_path / ".hg").is_dir():
169 sat_templates_source = sat_templates_root_path 169 sat_templates_source = sat_templates_root_path
170 sat_templates_target = "/src/sat_templates" 170 sat_templates_target = "/src/libervia-templates"
171 else: 171 else:
172 sat_templates_source = sat_templates_path 172 sat_templates_source = sat_templates_path
173 sat_templates_target = "/src/sat_templates/sat_templates" 173 sat_templates_target = "/src/libervia-templates/sat_templates"
174 174
175 compose_e2e_path = docker_path / "docker-compose-e2e.yml" 175 compose_e2e_path = docker_path / "docker-compose-e2e.yml"
176 if not compose_e2e_path.is_file(): 176 if not compose_e2e_path.is_file():
177 raise exceptions.NotFound('"docker-compose-e2e.yml" file can\'t be found') 177 raise exceptions.NotFound('"docker-compose-e2e.yml" file can\'t be found')
178 178
184 services: 184 services:
185 backend: 185 backend:
186 volumes: 186 volumes:
187 - type: bind 187 - type: bind
188 source: {backend_root_path} 188 source: {backend_root_path}
189 target: /src/sat 189 target: /src/libervia-backend
190 read_only: true 190 read_only: true
191 web: 191 web:
192 volumes: 192 volumes:
193 - type: bind 193 - type: bind
194 source: {backend_root_path} 194 source: {backend_root_path}
195 target: /src/sat 195 target: /src/libervia-backend
196 read_only: true 196 read_only: true
197 - type: bind 197 - type: bind
198 source: {libervia_web_source} 198 source: {libervia_web_source}
199 target: {libervia_web_target} 199 target: {libervia_web_target}
200 read_only: true 200 read_only: true
222 docker_compose = sh.docker_compose.bake( 222 docker_compose = sh.docker_compose.bake(
223 "-f", compose_e2e_path, "-f", override_path) 223 "-f", compose_e2e_path, "-f", override_path)
224 docker_compose.up("-d") 224 docker_compose.up("-d")
225 225
226 p = docker_compose.exec( 226 p = docker_compose.exec(
227 "-T", "--workdir", "/src/sat/tests", "backend", 227 "-T", "--workdir", "/src/libervia-backend/tests", "backend",
228 "pytest", "-o", "cache_dir=/tmp", *sys.argv[1:], color="yes", 228 "pytest", "-o", "cache_dir=/tmp", *sys.argv[1:], color="yes",
229 _in=sys.stdin, _out=live_out, _out_bufsize=0, _err=live_err, _err_bufsize=0, 229 _in=sys.stdin, _out=live_out, _out_bufsize=0, _err=live_err, _err_bufsize=0,
230 _bg=True 230 _bg=True
231 ) 231 )
232 if visual: 232 if visual: