diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-01-17 09:57:02 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-01-17 11:36:51 +0100 |
| commit | 303c8d26864c3de555f3053e41070cda27cb4982 (patch) | |
| tree | 8b131201a6aa2b4091238ca3bd90e35d49ba79a7 | |
| parent | 56fb54f6407bed6b53d8abb47f8772fb01e33ac1 (diff) | |
| download | mullvadvpn-303c8d26864c3de555f3053e41070cda27cb4982.tar.xz mullvadvpn-303c8d26864c3de555f3053e41070cda27cb4982.zip | |
Make test_installation_idempotency succeed when there is no account
| -rw-r--r-- | test/test-manager/src/tests/install.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs index f086385f21..614b9d9bb9 100644 --- a/test/test-manager/src/tests/install.rs +++ b/test/test-manager/src/tests/install.rs @@ -284,8 +284,13 @@ pub async fn test_installation_idempotency( rpc: ServiceClient, mut mullvad_client: MullvadProxyClient, ) -> Result<(), Error> { - // Connect to any relay - connect_and_wait(&mut mullvad_client).await?; + // Connect to any relay. This forces the daemon to enter a secured target state + connect_and_wait(&mut mullvad_client) + .await + .or_else(|error| match error { + Error::UnexpectedErrorState(_) => Ok(()), + err => Err(err), + })?; // Disable auto-connect mullvad_client .set_auto_connect(false) @@ -302,8 +307,8 @@ pub async fn test_installation_idempotency( log::debug!("Installing new app"); rpc.install_app(get_package_desc(&TEST_CONFIG.current_app_filename)?) .await?; - // verify that daemon is running - wait_for_tunnel_state(mullvad_client.clone(), |state| state.is_connected()) + // verify that the daemon starts in a non-disconnected state + wait_for_tunnel_state(mullvad_client.clone(), |state| !state.is_disconnected()) .await .map_err(|err| { log::error!( |