2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-08 14:21:05 +00:00

Fix builds failing (#793)

* Fix builds failing
Fixes #792

* Suppress `docker compose down` errors in cleanup

* Cover all cases

* Fix linting

* Remove unused import
This commit is contained in:
Lev 2022-05-02 01:28:25 +03:00 committed by GitHub
parent ed5311473c
commit 9f502c8538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View File

@ -43,8 +43,10 @@ def compose(env_file: str):
@pytest.fixture(autouse=True, scope="session")
def frappe_setup(compose: Compose):
compose.stop()
compose("up", "-d", "--quiet-pull")
yield
compose.stop()

View File

@ -3,6 +3,7 @@ import ssl
import subprocess
import sys
import time
from contextlib import suppress
from typing import Callable, Optional
from urllib.error import HTTPError, URLError
from urllib.request import Request, urlopen
@ -46,7 +47,10 @@ class Compose:
self("exec", "-T", *cmd)
def stop(self) -> None:
subprocess.check_call(self.base_cmd + ("down", "-v", "--remove-orphans"))
# Stop all containers in `test` project if they are running.
# We don't care if it fails.
with suppress(subprocess.CalledProcessError):
subprocess.check_call(self.base_cmd + ("down", "-v", "--remove-orphans"))
def bench(self, *cmd: str) -> None:
self.exec("backend", "bench", *cmd)