cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-13 01:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix cmdeploy test command

Browse Source
This commit is contained in:
holger krekel
2023-12-11 14:05:07 +01:00
parent d70eb78a76
commit cdbda291c5
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
deploy-chatmail/src/deploy_chatmail/cmdeploy.py
View File

@@ -111,26 +111,20 @@ def status_cmd(args, out):
def test_cmd(args, out):
"""Run local and online tests.
"""Run local and online tests for chatmail deployment.
This will also pip-install 'deltachat' if it's not available.
This will automatically pip-install 'deltachat' if it's not available.
"""
tox = shutil.which("tox")
proc1 = subprocess.run([tox, "-c", "chatmaild"])
proc2 = subprocess.run([tox, "-c", "deploy-chatmail"])
x = importlib.util.find_spec("deltachat")
if x is None:
out.check_call(f"{sys.executable} -m pip install deltachat")
pytest_path = shutil.which("pytest")
proc3 = subprocess.run(
[pytest_path, "tests/", "-rs", "-x", "-vrx", "--durations=5"]
ret = out.run_ret(
[pytest_path, "tests/", "-n4", "-rs", "-x", "-vrx", "--durations=5"]
)
if any(x.returncode != 0 for x in (proc1, proc2, proc3)):
return 1
return 0
return ret
def fmt_cmd_options(parser):
@@ -219,6 +213,13 @@ class Out:
self(f"[$ {arg}]", file=sys.stderr)
return subprocess.check_call(arg, shell=True, env=env)
def run_ret(self, args, env=None, quiet=False):
if not quiet:
cmdstring = " ".join(args)
self(f"[$ {cmdstring}]", file=sys.stderr)
proc = subprocess.run(args, env=env)
return proc.returncode
def add_config_option(parser):
parser.add_argument(