various fixes

This commit is contained in:
holger krekel
2023-12-09 00:18:03 +01:00
parent d8c8040f07
commit 1b1f9365c9
13 changed files with 171 additions and 90 deletions

View File

@@ -2,20 +2,25 @@ import textwrap
import importlib.resources
from deploy_chatmail.www import build_webpages
from deploy_chatmail import get_ini_settings
from chatmaild.config import read_config
def create_ini(inipath):
def create_ini(inipath, domain="example.org"):
inipath.write_text(
textwrap.dedent(
"""\
[config]
f"""\
[params]
max_user_send_per_minute = 60
filtermail_smtp_port = 10080
postfix_reinject_port = 10025
[privacy:{domain}]
domain = example.org
privacy_postal =
address-line1
address-line2
privacy_mail = privacy@example.org
privacy_mail = privacy@{domain}
privacy_pdo =
address-line3
@@ -30,18 +35,18 @@ def test_build_webpages(tmp_path):
assert src_dir.exists(), src_dir
inipath = tmp_path.joinpath("chatmail.ini")
create_ini(inipath)
config = get_ini_settings("example.org", inipath)
create_ini(inipath, "example.org")
config = read_config(inipath, "example.org")
build_dir = tmp_path.joinpath("build")
build_webpages(src_dir, build_dir, config)
def test_get_settings(tmp_path):
inipath = tmp_path.joinpath("chatmail.ini")
create_ini(inipath)
create_ini(inipath, "example.org")
d = get_ini_settings("x.testrun.org", inipath)
assert d["privacy_postal"] == "address-line1\naddress-line2"
assert d["privacy_mail"] == "privacy@example.org"
assert d["privacy_pdo"] == "address-line3"
assert d["mail_domain"] == "x.testrun.org"
config = read_config(inipath, "example.org")
assert config.privacy_postal == "address-line1\naddress-line2"
assert config.privacy_mail == "privacy@example.org"
assert config.privacy_pdo == "address-line3"
assert config.mailname == "example.org"