tests: group tests by provider

.github/workflows/fastmail-imap-tests.yml

@@ -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 }}

.github/workflows/fastmail-jmap-tests.yml

@@ -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 }}

.github/workflows/fastmail-smtp-tests.yml

@@ -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 }}

.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 }}

.github/workflows/stalwart-imap-tests.yml

@@ -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

.github/workflows/stalwart-smtp-tests.yml

@@ -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

.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

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"}' \