diff options
| -rw-r--r-- | mullvad-tests/src/lib.rs | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/mullvad-tests/src/lib.rs b/mullvad-tests/src/lib.rs index 978eae1816..e27a4be508 100644 --- a/mullvad-tests/src/lib.rs +++ b/mullvad-tests/src/lib.rs @@ -181,6 +181,23 @@ impl Iterator for PathWatcher { } } +pub fn wait_for_file<P: AsRef<Path>>(file_path: P) { + let file_path = file_path.as_ref(); + let mut watcher = PathWatcher::watch(&file_path).expect(&format!( + "Failed to watch file for changes: {}", + file_path.display() + )); + + if !file_path.exists() { + // No event has been emitted yet. Wait for the initial create event. + assert_eq!(watcher.next(), Some(watch_event::CREATE)); + } + + // The file was created, so at least one event was emitted. Assume the write burst has started + // and wait for a short amount of time until it completes. + watcher.wait_for_burst_of_events(Duration::from_secs(1)); +} + fn prepare_test_dirs() -> (TempDir, PathBuf, PathBuf, PathBuf) { let temp_dir = TempDir::new().expect("Failed to create temporary daemon directory"); let cache_dir = temp_dir.path().join("cache"); @@ -327,16 +344,7 @@ impl DaemonRunner { } pub fn rpc_client(&mut self) -> Result<DaemonRpcClient> { - let _wait_for_rpc_file = PathWatcher::watch(&self.rpc_address_file).map(|mut watcher| { - if !self.rpc_address_file.exists() { - // No event has been emitted yet. Wait for a longer amount of time. - watcher.wait_for_burst_of_events(Duration::from_secs(10)); - } else { - // The file was created, so at least one event was emitted. Assume the burst has - // started and wait for a shorter amount of time. - watcher.wait_for_burst_of_events(Duration::from_secs(1)); - } - }); + wait_for_file(&self.rpc_address_file); DaemonRpcClient::with_insecure_rpc_address_file(&self.rpc_address_file) .map_err(|error| format!("Failed to create RPC client: {}", error)) |