cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-20 12:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

"cmdeploy test" now installs deltachat if it's not there

Browse Source
This commit is contained in:
holger krekel
2023-12-11 02:13:46 +01:00
parent 6c453f93a1
commit 0662e3a8b1
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ import argparse
import datetime import datetime
import shutil import shutil
import subprocess import subprocess
import importlib import importlib.util
import os import os
import sys import sys
from pathlib import Path from pathlib import Path
@@ -110,12 +110,19 @@ def status_cmd(args, out):
def test_cmd(args, out): def test_cmd(args, out):
"""Run local and online tests.""" """Run local and online tests.
This will also pip-install 'deltachat' if it's not available.
"""
tox = shutil.which("tox") tox = shutil.which("tox")
proc1 = subprocess.run([tox, "-c", "chatmaild"]) proc1 = subprocess.run([tox, "-c", "chatmaild"])
proc2 = subprocess.run([tox, "-c", "deploy-chatmail"]) 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") pytest_path = shutil.which("pytest")
proc3 = subprocess.run( proc3 = subprocess.run(
[pytest_path, "tests/online", "-rs", "-x", "-vrx", "--durations=5"] [pytest_path, "tests/online", "-rs", "-x", "-vrx", "--durations=5"]
@@ -161,7 +168,7 @@ class Out:
self(f"[$ {arg}]", file=sys.stderr) self(f"[$ {arg}]", file=sys.stderr)
return subprocess.check_output(arg, shell=True).decode() return subprocess.check_output(arg, shell=True).decode()
def check_call(self, arg, env): def check_call(self, arg, env=None):
self(f"[$ {arg}]", file=sys.stderr) self(f"[$ {arg}]", file=sys.stderr)
return subprocess.check_call(arg, shell=True, env=env) return subprocess.check_call(arg, shell=True, env=env)
@@ -181,8 +188,9 @@ def add_subcommand(subparsers, func):
name = func.__name__ name = func.__name__
assert name.endswith("_cmd") assert name.endswith("_cmd")
name = name[:-4] name = name[:-4]
doc = func.__doc__.strip().strip(".") doc = func.__doc__.strip()
p = subparsers.add_parser(name, description=doc, help=doc) help = doc.split("\n")[0].strip(".")
p = subparsers.add_parser(name, description=doc, help=help)
p.set_defaults(func=func) p.set_defaults(func=func)
add_config_option(p) add_config_option(p)
return p return p