Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-08 09:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing unit tests for MacOS

Browse source
This commit is contained in:
Ericson "Fogo" Soares 2023-01-13 17:02:57 -03:00
parent 4638f104be
commit 6b17409a72
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/location/manager/watcher/macos.rs
View file

@ -8,7 +8,6 @@ use notify::{
event::{CreateKind, DataChange, ModifyKind, RenameMode},
Event, EventKind,
};
use tokio::{fs, io};
use tracing::trace;
use super::{

11
core/src/location/manager/watcher/mod.rs
View file

@ -333,7 +333,10 @@ mod tests {
Config, Event, EventKind, RecommendedWatcher, Watcher,
};
use std::io::ErrorKind;
use std::{path::Path, time::Duration};
use std::{
path::{Path, PathBuf},
time::Duration,
};
use tempfile::{tempdir, TempDir};
use tokio::{fs, io::AsyncWriteExt, sync::mpsc, time::sleep};
use tracing::{debug, error};
@ -375,8 +378,10 @@ mod tests {
Ok(maybe_event) => {
let event = maybe_event.expect("Failed to receive event");
debug!("Received event: {event:#?}");
// Using `ends_with` here due to a weird edge case on CI tests at MacOS
if event.paths[0].ends_with(path) && event.kind == expected_event {
// Using `ends_with` and removing root path here due to a weird edge case on CI tests at MacOS
if event.paths[0].ends_with(path.iter().skip(1).collect::<PathBuf>())
&& event.kind == expected_event
{
debug!("Received expected event: {expected_event:#?}");
break;
}