test: fix flaky tests.

tests/features/user/addressmode.feature

@@ -14,9 +14,11 @@ Feature: Address mode
       | from       | to         | subject | unread |
       | c@[domain] | c@[domain] | three   | true   |
       | d@[domain] | d@[domain] | four    | false  |
-    And bridge starts
+    Then it succeeds
+    When bridge starts
     And the user logs in with username "[user:user]" and password "password"
     And user "[user:user]" finishes syncing
+    Then it succeeds
 
   Scenario: The user is in combined mode
     When user "[user:user]" connects and authenticates IMAP client "1" with address "[user:user]@[domain]"

tests/features/user/delete.feature

@@ -1,8 +1,10 @@
 Feature: A user can be deleted
   Background:
     Given there exists an account with username "[user:user]" and password "password"
-    And bridge starts
+    Then it succeeds
+    When bridge starts
     And the user logs in with username "[user:user]" and password "password"
+    Then it succeeds
 
   Scenario: Delete a connected user
     When user "[user:user]" is deleted

tests/features/user/login.feature

@@ -1,9 +1,11 @@
 Feature: A user can login
   Background:
     Given there exists an account with username "[user:user]" and password "password"
-    Given there exists an account with username "[user:MixedCaps]" and password "password"
-    Given there exists a disabled account with username "[user:disabled]" and password "password"
+    And there exists an account with username "[user:MixedCaps]" and password "password"
+    And there exists a disabled account with username "[user:disabled]" and password "password"
+    Then it succeeds
     And bridge starts
+    Then it succeeds
 
   Scenario: Login to account
     When the user logs in with username "[user:user]" and password "password"

tests/features/user/relogin.feature

@@ -1,8 +1,10 @@
 Feature: A logged out user can login again
   Background:
     Given there exists an account with username "[user:user]" and password "password"
-    And bridge starts
+    Then it succeeds
+    When bridge starts
     And the user logs in with username "[user:user]" and password "password"
+    Then it succeeds
 
   Scenario: Login to disconnected account
     When user "[user:user]" logs out

tests/features/user/revoke.feature

@@ -1,8 +1,10 @@
 Feature: A logged in user is logged out when its auth is revoked.
   Background:
     Given there exists an account with username "[user:user]" and password "password"
-    And bridge starts
+    Then it succeeds
+    When bridge starts
     And the user logs in with username "[user:user]" and password "password"
+    Then it succeeds
 
   Scenario: The auth is revoked while bridge is running
     When the auth of user "[user:user]" is revoked

tests/features/user/sync.feature

@@ -14,7 +14,9 @@ Feature: Bridge can fully sync an account
       | from       | to         | subject | unread |
       | a@[domain] | a@[domain] | one     | true   |
       | b@[domain] | b@[domain] | two     | false  |
-    And bridge starts
+    Then it succeeds
+    When bridge starts
+    Then it succeeds
 
   Scenario: The account is synced when the user logs in and persists across bridge restarts
     When the user logs in with username "[user:user]" and password "password"

tests/features/user/telemetry.feature

@@ -2,7 +2,9 @@ Feature: Bridge send usage metrics
   Background:
     Given there exists an account with username "[user:user1]" and password "password"
     And there exists an account with username "[user:user2]" and password "password"
-    And bridge starts
+    Then it succeeds
+    When bridge starts
+    Then it succeeds
 
 
   Scenario: Telemetry availability - No user