From a7ba13bfb53578d52ddc1233a7ffda7b7783b1b5 Mon Sep 17 00:00:00 2001 From: ccclxxiii <151577046+ccclxxiii@users.noreply.github.com> Date: Thu, 28 May 2026 14:40:38 +0000 Subject: [PATCH 1/6] test: pin to updated cmlxc[wip] --- .github/workflows/ci-no-dns.yaml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-no-dns.yaml b/.github/workflows/ci-no-dns.yaml index bc1e425df..b17fd6384 100644 --- a/.github/workflows/ci-no-dns.yaml +++ b/.github/workflows/ci-no-dns.yaml @@ -20,9 +20,9 @@ concurrency: jobs: no-dns: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.14.6 + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@8807cbbf386f32294f08963a8295c9820218ae01 with: - cmlxc_version: v0.14.6 + cmlxc_version: 8807cbbf386f32294f08963a8295c9820218ae01 cmlxc_commands: | cmlxc init # single cmdeploy relay test diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 684a954c2..ba1745a5e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,9 +57,9 @@ jobs: lxc-test: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.14.6 + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@8807cbbf386f32294f08963a8295c9820218ae01 with: - cmlxc_version: v0.14.6 + cmlxc_version: 8807cbbf386f32294f08963a8295c9820218ae01 cmlxc_commands: | cmlxc init # single cmdeploy relay test From f9d1e05e80994f74de15535f8f1febea7fc81e8e Mon Sep 17 00:00:00 2001 From: ccclxxiii <151577046+ccclxxiii@users.noreply.github.com> Date: Thu, 28 May 2026 14:41:21 +0000 Subject: [PATCH 2/6] test: [wip] remove deprecated method in 2.50 --- cmdeploy/src/cmdeploy/tests/plugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdeploy/src/cmdeploy/tests/plugin.py b/cmdeploy/src/cmdeploy/tests/plugin.py index c61b44264..04483006b 100644 --- a/cmdeploy/src/cmdeploy/tests/plugin.py +++ b/cmdeploy/src/cmdeploy/tests/plugin.py @@ -360,9 +360,9 @@ def get_online_accounts(self, num, domain=None): ) futures.append(future) - # ensure messages stay in INBOX so that they can be - # concurrently fetched via extra IMAP connections during tests - account.set_config("delete_server_after", "10") + # # ensure messages stay in INBOX so that they can be + # # concurrently fetched via extra IMAP connections during tests + # account.set_config("delete_server_after", "10") accounts.append(account) for future in futures: From cfc7882b700a7162c8f07f4aa166b22abb387e4b Mon Sep 17 00:00:00 2001 From: ccclxxiii <151577046+ccclxxiii@users.noreply.github.com> Date: Thu, 28 May 2026 14:41:42 +0000 Subject: [PATCH 3/6] test: poll inbox in sender ip minitest --- .../cmdeploy/tests/online/test_2_deltachat.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py b/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py index 9cf79ffce..d0dffe66a 100644 --- a/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py +++ b/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py @@ -177,11 +177,23 @@ def test_hide_senders_ip_address(cmfactory, ssl_context): chat.send_text("testing submission header cleanup") user2.wait_for_incoming_msg() + addr = user2.get_config("addr") host = addr.split("@")[1].strip("[").strip("]") pw = user2.get_config("mail_pw") mailbox = imap_tools.MailBox(host, ssl_context=ssl_context) mailbox.login(addr, pw) - msgs = list(mailbox.fetch(mark_seen=False)) + + deadline = time.time() + 10 + msgs = [] + + while time.time() < deadline: + mailbox.folder.set("INBOX") + msgs = list(mailbox.fetch(criteria="ALL", mark_seen=False)) + if msgs: + break + time.sleep(0.5) + assert msgs, "expected at least one message" - assert public_ip not in msgs[0].obj.as_string() + assert public_ip not in msgs[-1].obj.as_string() + From 48e8e192e739f646f2cd2b23d292217a9a4c5135 Mon Sep 17 00:00:00 2001 From: ccclxxiii <151577046+ccclxxiii@users.noreply.github.com> Date: Thu, 28 May 2026 15:02:07 +0000 Subject: [PATCH 4/6] test: [wip] update sha pin for missing time import --- .github/workflows/ci-no-dns.yaml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-no-dns.yaml b/.github/workflows/ci-no-dns.yaml index b17fd6384..0f5ce5973 100644 --- a/.github/workflows/ci-no-dns.yaml +++ b/.github/workflows/ci-no-dns.yaml @@ -20,9 +20,9 @@ concurrency: jobs: no-dns: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@8807cbbf386f32294f08963a8295c9820218ae01 + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@17e0d871869ad953268eefa0a448e95c73b9197d with: - cmlxc_version: 8807cbbf386f32294f08963a8295c9820218ae01 + cmlxc_version: 17e0d871869ad953268eefa0a448e95c73b9197d cmlxc_commands: | cmlxc init # single cmdeploy relay test diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ba1745a5e..28d1c8f5e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,9 +57,9 @@ jobs: lxc-test: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@8807cbbf386f32294f08963a8295c9820218ae01 + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@17e0d871869ad953268eefa0a448e95c73b9197d with: - cmlxc_version: 8807cbbf386f32294f08963a8295c9820218ae01 + cmlxc_version: 17e0d871869ad953268eefa0a448e95c73b9197d cmlxc_commands: | cmlxc init # single cmdeploy relay test From 6e97b94d8be2681c7a452b6070d97624f393b40f Mon Sep 17 00:00:00 2001 From: ccclxxiii <151577046+ccclxxiii@users.noreply.github.com> Date: Thu, 28 May 2026 15:19:19 +0000 Subject: [PATCH 5/6] test: inspect bcc copy in sender ip cleanup test --- cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py b/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py index d0dffe66a..759230328 100644 --- a/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py +++ b/cmdeploy/src/cmdeploy/tests/online/test_2_deltachat.py @@ -167,20 +167,20 @@ def test_read_receipts_between_instances(self, cmfactory, lp, maildomain2): assert "error" not in m.get_info() time.sleep(1) - def test_hide_senders_ip_address(cmfactory, ssl_context): public_ip = requests.get("http://icanhazip.com").content.decode().strip() assert ipaddress.ip_address(public_ip) user1, user2 = cmfactory.get_online_accounts(2) + user1.set_config("bcc_self", "1") chat = cmfactory.get_accepted_chat(user1, user2) chat.send_text("testing submission header cleanup") user2.wait_for_incoming_msg() - addr = user2.get_config("addr") + addr = user1.get_config("addr") host = addr.split("@")[1].strip("[").strip("]") - pw = user2.get_config("mail_pw") + pw = user1.get_config("mail_pw") mailbox = imap_tools.MailBox(host, ssl_context=ssl_context) mailbox.login(addr, pw) @@ -196,4 +196,3 @@ def test_hide_senders_ip_address(cmfactory, ssl_context): assert msgs, "expected at least one message" assert public_ip not in msgs[-1].obj.as_string() - From b323df1b8c76ee0e067bdbd0592eba52d291b36c Mon Sep 17 00:00:00 2001 From: ccclxxiii <151577046+ccclxxiii@users.noreply.github.com> Date: Thu, 28 May 2026 15:19:32 +0000 Subject: [PATCH 6/6] test: update sha pin --- .github/workflows/ci-no-dns.yaml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-no-dns.yaml b/.github/workflows/ci-no-dns.yaml index 0f5ce5973..59d941f01 100644 --- a/.github/workflows/ci-no-dns.yaml +++ b/.github/workflows/ci-no-dns.yaml @@ -20,9 +20,9 @@ concurrency: jobs: no-dns: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@17e0d871869ad953268eefa0a448e95c73b9197d + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@6d64dff5cf1ad3ccd37f7b51ee0a96bbdc9c84d2 with: - cmlxc_version: 17e0d871869ad953268eefa0a448e95c73b9197d + cmlxc_version: 6d64dff5cf1ad3ccd37f7b51ee0a96bbdc9c84d2 cmlxc_commands: | cmlxc init # single cmdeploy relay test diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 28d1c8f5e..bb753a488 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,9 +57,9 @@ jobs: lxc-test: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@17e0d871869ad953268eefa0a448e95c73b9197d + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@6d64dff5cf1ad3ccd37f7b51ee0a96bbdc9c84d2 with: - cmlxc_version: 17e0d871869ad953268eefa0a448e95c73b9197d + cmlxc_version: 6d64dff5cf1ad3ccd37f7b51ee0a96bbdc9c84d2 cmlxc_commands: | cmlxc init # single cmdeploy relay test