Wait for service after app install in tests

2 files changed, 7 insertions, 16 deletions

diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index 5467ddfb9f..55b7b2384e 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -34,9 +34,7 @@ use std::{
     time::{Duration, Instant},
 };
 use talpid_types::net::wireguard::{PeerConfig, PrivateKey, TunnelConfig};
-use test_rpc::{
-    AmIMullvad, ServiceClient, SpawnOpts, meta::Os, mullvad_daemon::ServiceStatus, package::Package,
-};
+use test_rpc::{AmIMullvad, ServiceClient, SpawnOpts, meta::Os, package::Package};
 use tokio::time::sleep;
 
 pub const THROTTLE_RETRY_DELAY: Duration = Duration::from_secs(120);
@@ -74,18 +72,6 @@ pub async fn install_app(
     log::info!("Installing app '{}'", app_filename);
     rpc.install_app(get_package_desc(app_filename)).await?;
 
-    // verify that daemon is running
-    tokio::time::timeout(Duration::from_secs(5), async {
-        loop {
-            if rpc.mullvad_daemon_get_status().await? == ServiceStatus::Running {
-                return Ok::<_, Error>(());
-            }
-            sleep(Duration::from_millis(100)).await;
-        }
-    })
-    .await
-    .map_err(|_timeout| Error::DaemonNotRunning)??;
-
     // Set the log level to trace
     rpc.set_daemon_log_level(test_rpc::mullvad_daemon::Verbosity::Trace)
         .await
diff --git a/test/test-rpc/src/client.rs b/test/test-rpc/src/client.rs
index dceca28587..56b381ba68 100644
--- a/test/test-rpc/src/client.rs
+++ b/test/test-rpc/src/client.rs
@@ -45,7 +45,12 @@ impl ServiceClient {
         self.client
             .install_app(ctx, package_path)
             .await
-            .map_err(Error::Tarpc)?
+            .map_err(Error::Tarpc)??;
+
+        self.mullvad_daemon_wait_for_state(|state| state == ServiceStatus::Running)
+            .await?;
+
+        Ok(())
     }
 
     /// Remove app package.