cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-10 16:04:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply last review suggestions

Browse Source
This commit is contained in:
holger krekel
2024-07-10 19:10:57 +02:00
parent b7e6926880
commit 73e6f5e6da
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chatmaild/src/chatmaild/config.py
View File

@@ -24,7 +24,7 @@ class Config:
self.passthrough_senders = params["passthrough_senders"].split() self.passthrough_senders = params["passthrough_senders"].split()
self.passthrough_recipients = params["passthrough_recipients"].split() self.passthrough_recipients = params["passthrough_recipients"].split()
self.mailboxes_dir = Path(params["mailboxes_dir"].strip()) self.mailboxes_dir = Path(params["mailboxes_dir"].strip())
self.passdb_path = params["passdb_path"].strip().rstrip("/") self.passdb_path = Path(params["passdb_path"].strip())
self.filtermail_smtp_port = int(params["filtermail_smtp_port"]) self.filtermail_smtp_port = int(params["filtermail_smtp_port"])
self.postfix_reinject_port = int(params["postfix_reinject_port"]) self.postfix_reinject_port = int(params["postfix_reinject_port"])
self.iroh_relay = params.get("iroh_relay") self.iroh_relay = params.get("iroh_relay")

6
chatmaild/src/chatmaild/tests/test_config.py
View File

@@ -1,5 +1,3 @@
from pathlib import Path
import pytest import pytest
from chatmaild.config import read_config from chatmaild.config import read_config
@@ -38,12 +36,12 @@ def test_read_config_testrun(make_config):
def test_config_userstate_paths(make_config, tmp_path): def test_config_userstate_paths(make_config, tmp_path):
config = make_config("something.testrun.org") config = make_config("something.testrun.org")
mailboxes_dir = config.mailboxes_dir mailboxes_dir = config.mailboxes_dir
passdb_path = Path(config.passdb_path) passdb_path = config.passdb_path
assert mailboxes_dir.name == "something.testrun.org" assert mailboxes_dir.name == "something.testrun.org"
assert passdb_path.name == "passdb.sqlite" assert passdb_path.name == "passdb.sqlite"
assert passdb_path.is_relative_to(tmp_path) assert passdb_path.is_relative_to(tmp_path)
assert config.mail_domain == "something.testrun.org" assert config.mail_domain == "something.testrun.org"
path = Path(config.get_user_maildir("user1@something.testrun.org")) path = config.get_user_maildir("user1@something.testrun.org")
assert not path.exists() assert not path.exists()
assert path == mailboxes_dir.joinpath("user1@something.testrun.org") assert path == mailboxes_dir.joinpath("user1@something.testrun.org")