Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-09 01:46:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove unused --liveconfig option

Browse Source 
close  #4892
This commit is contained in:
Sebastian Klähn
2023-11-09 18:45:33 +01:00
committed by holger krekel
parent ce016eb567
commit 790509676f
1 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
python/src/deltachat/testplugin.py
View File

@@ -23,12 +23,6 @@ from .events import FFIEventLogger, FFIEventTracker
def pytest_addoption(parser): def pytest_addoption(parser):
group = parser.getgroup("deltachat testplugin options") group = parser.getgroup("deltachat testplugin options")
group.addoption(
"--liveconfig",
action="store",
default=None,
help="a file with >=2 lines where each line contains NAME=VALUE config settings for one account",
)
group.addoption( group.addoption(
"--chatmail", "--chatmail",
action="store", action="store",
@@ -58,8 +52,6 @@ def pytest_addoption(parser):
def pytest_configure(config): def pytest_configure(config):
cfg = config.getoption("--liveconfig")
cfg = config.getoption("--chatmail") cfg = config.getoption("--chatmail")
if not cfg: if not cfg:
cfg = os.getenv("CHATMAIL_DOMAIN") cfg = os.getenv("CHATMAIL_DOMAIN")
@@ -134,12 +126,10 @@ def pytest_report_header(config, startdir):
] ]
cfg = config.option.liveconfig cfg = config.option.liveconfig
if cfg: if cfg and "?" in cfg:
if "?" in cfg: url, token = cfg.split("?", 1)
url, token = cfg.split("?", 1) summary.append(f"Liveconfig provider: {url}?<token omitted>")
summary.append(f"Liveconfig provider: {url}?<token omitted>")
else:
summary.append(f"Liveconfig file: {cfg}")
return summary return summary
@@ -164,11 +154,7 @@ class TestProcess:
def get_liveconfig_producer(self): def get_liveconfig_producer(self):
"""provide live account configs, cached on a per-test-process scope """provide live account configs, cached on a per-test-process scope
so that test functions can re-use already known live configs. so that test functions can re-use already known live configs.
Depending on the --liveconfig option this comes from
a file with a line specifying each accounts config
or a --chatmail domain.
""" """
liveconfig_opt = self.pytestconfig.getoption("--liveconfig")
chatmail_opt = self.pytestconfig.getoption("--chatmail") chatmail_opt = self.pytestconfig.getoption("--chatmail")
if chatmail_opt: if chatmail_opt:
# Use a chatmail instance. # Use a chatmail instance.
@@ -186,20 +172,9 @@ class TestProcess:
self._configlist.append(config) self._configlist.append(config)
yield config yield config
pytest.fail(f"more than {MAX_LIVE_CREATED_ACCOUNTS} live accounts requested.") pytest.fail(f"more than {MAX_LIVE_CREATED_ACCOUNTS} live accounts requested.")
elif liveconfig_opt:
# Read a list of accounts from file.
for line in open(liveconfig_opt):
if line.strip() and not line.strip().startswith("#"):
d = {}
for part in line.split():
name, value = part.split("=")
d[name] = value
self._configlist.append(d)
yield from iter(self._configlist)
else: else:
pytest.skip( pytest.skip(
"specify --liveconfig, CHATMAIL_DOMAIN or --chatmail to provide live accounts", "specify CHATMAIL_DOMAIN or --chatmail to provide live accounts",
) )
def cache_maybe_retrieve_configured_db_files(self, cache_addr, db_target_path): def cache_maybe_retrieve_configured_db_files(self, cache_addr, db_target_path):