From 9ffcfcb1ba7c384e9d6300b2a0fc49ba39e61ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Thu, 2 Apr 2026 12:09:26 +0200 Subject: [PATCH] tests: group tests by provider --- .github/workflows/fastmail-imap-tests.yml | 17 ------------- .github/workflows/fastmail-jmap-tests.yml | 17 ------------- .github/workflows/fastmail-smtp-tests.yml | 17 ------------- .github/workflows/fastmail-tests.yml | 25 +++++++++++++++++++ .github/workflows/stalwart-imap-tests.yml | 16 ------------ .github/workflows/stalwart-smtp-tests.yml | 16 ------------ ...wart-jmap-tests.yml => stalwart-tests.yml} | 6 +++-- tests/stalwart.sh | 9 ++++--- 8 files changed, 34 insertions(+), 89 deletions(-) delete mode 100644 .github/workflows/fastmail-imap-tests.yml delete mode 100644 .github/workflows/fastmail-jmap-tests.yml delete mode 100644 .github/workflows/fastmail-smtp-tests.yml create mode 100644 .github/workflows/fastmail-tests.yml delete mode 100644 .github/workflows/stalwart-imap-tests.yml delete mode 100644 .github/workflows/stalwart-smtp-tests.yml rename .github/workflows/{stalwart-jmap-tests.yml => stalwart-tests.yml} (57%) diff --git a/.github/workflows/fastmail-imap-tests.yml b/.github/workflows/fastmail-imap-tests.yml deleted file mode 100644 index 3663612a..00000000 --- a/.github/workflows/fastmail-imap-tests.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Fastmail IMAP tests - -on: - push: - branches: - - v2 - -jobs: - fastmail-imap-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - run: cargo test --no-default-features --features imap,rustls-ring --test fastmail-imap -- --ignored - env: - FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }} - FASTMAIL_APP_PASSWORD: ${{ secrets.FASTMAIL_APP_PASSWORD }} diff --git a/.github/workflows/fastmail-jmap-tests.yml b/.github/workflows/fastmail-jmap-tests.yml deleted file mode 100644 index e6c438d7..00000000 --- a/.github/workflows/fastmail-jmap-tests.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Fastmail JMAP tests - -on: - push: - branches: - - v2 - -jobs: - fastmail-jmap-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - run: cargo test --no-default-features --features jmap,rustls-ring --test fastmail-jmap -- --ignored - env: - FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }} - FASTMAIL_API_TOKEN: ${{ secrets.FASTMAIL_API_TOKEN }} diff --git a/.github/workflows/fastmail-smtp-tests.yml b/.github/workflows/fastmail-smtp-tests.yml deleted file mode 100644 index 08683908..00000000 --- a/.github/workflows/fastmail-smtp-tests.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Fastmail SMTP tests - -on: - push: - branches: - - v2 - -jobs: - fastmail-smtp-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - run: cargo test --no-default-features --features smtp,rustls-ring --test fastmail-smtp -- --ignored - env: - FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }} - FASTMAIL_APP_PASSWORD: ${{ secrets.FASTMAIL_APP_PASSWORD }} diff --git a/.github/workflows/fastmail-tests.yml b/.github/workflows/fastmail-tests.yml new file mode 100644 index 00000000..7f650831 --- /dev/null +++ b/.github/workflows/fastmail-tests.yml @@ -0,0 +1,25 @@ +name: Fastmail tests + +on: + push: + branches: + - v2 + +jobs: + fastmail-tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo test --no-default-features --features jmap,rustls-ring --test fastmail-jmap -- --ignored + env: + FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }} + FASTMAIL_API_TOKEN: ${{ secrets.FASTMAIL_API_TOKEN }} + - run: cargo test --no-default-features --features imap,rustls-ring --test fastmail-imap -- --ignored + env: + FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }} + FASTMAIL_APP_PASSWORD: ${{ secrets.FASTMAIL_APP_PASSWORD }} + - run: cargo test --no-default-features --features smtp,rustls-ring --test fastmail-smtp -- --ignored + env: + FASTMAIL_EMAIL: ${{ secrets.FASTMAIL_EMAIL }} + FASTMAIL_APP_PASSWORD: ${{ secrets.FASTMAIL_APP_PASSWORD }} diff --git a/.github/workflows/stalwart-imap-tests.yml b/.github/workflows/stalwart-imap-tests.yml deleted file mode 100644 index 6961df4b..00000000 --- a/.github/workflows/stalwart-imap-tests.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Stalwart IMAP tests - -on: - push: - branches: - - v2 - -jobs: - stalwart-imap-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - run: ./tests/stalwart.sh - - run: cargo test --no-default-features --features imap,rustls-ring --test stalwart-imap -- --ignored - - run: docker stop himalaya-tests diff --git a/.github/workflows/stalwart-smtp-tests.yml b/.github/workflows/stalwart-smtp-tests.yml deleted file mode 100644 index 50af43fb..00000000 --- a/.github/workflows/stalwart-smtp-tests.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Stalwart SMTP tests - -on: - push: - branches: - - v2 - -jobs: - stalwart-smtp-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - run: ./tests/stalwart.sh - - run: cargo test --no-default-features --features smtp,rustls-ring --test stalwart-smtp -- --ignored - - run: docker stop himalaya-tests diff --git a/.github/workflows/stalwart-jmap-tests.yml b/.github/workflows/stalwart-tests.yml similarity index 57% rename from .github/workflows/stalwart-jmap-tests.yml rename to .github/workflows/stalwart-tests.yml index aa337bfb..0b88ac5e 100644 --- a/.github/workflows/stalwart-jmap-tests.yml +++ b/.github/workflows/stalwart-tests.yml @@ -1,4 +1,4 @@ -name: Stalwart JMAP tests +name: Stalwart tests on: push: @@ -6,11 +6,13 @@ on: - v2 jobs: - stalwart-jmap-tests: + stalwart-tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - run: ./tests/stalwart.sh - run: cargo test --no-default-features --features jmap,rustls-ring --test stalwart-jmap -- --ignored + - run: cargo test --no-default-features --features imap,rustls-ring --test stalwart-imap -- --ignored + - run: cargo test --no-default-features --features smtp,rustls-ring --test stalwart-smtp -- --ignored - run: docker stop himalaya-tests diff --git a/tests/stalwart.sh b/tests/stalwart.sh index 67b654ce..bd6b136c 100755 --- a/tests/stalwart.sh +++ b/tests/stalwart.sh @@ -2,11 +2,12 @@ set -eu -container=$(docker run -d --name himalaya-tests --rm -p 8080:8080 -p 25:25 -p 143:143 stalwartlabs/stalwart:v0.15.5-alpine) -sleep 1 -admin_password=$(docker logs $container 2>&1 | grep -oP "(?<=with password ')[^']+") +docker run -d --name himalaya-tests --rm -p 8080:8080 -p 25:25 -p 143:143 stalwartlabs/stalwart:v0.15.5-alpine -curl -sX POST \ +sleep 1 +admin_password=$(docker logs himalaya-tests 2>&1 | grep -oP "(?<=with password ')[^']+") + +curl -X POST \ -u "admin:${admin_password}" \ -H 'Content-Type: application/json' \ -d '{"type":"domain","name":"pimalaya.org"}' \