Convert all test platform skips to proper ignores

notify-rs · Oct 5, 2018 · 0b4c840 · 0b4c840
1 parent 1263ff6
commit 0b4c840
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/tests/debounce.rs b/tests/debounce.rs
@@ -846,7 +846,7 @@ fn create_rename_delete_directory() {
 }
 
 #[test]
-#[cfg(not(target_os="windows"))]
+#[cfg_attr(target_os = "windows", ignore)]
 fn create_rename_overwrite_directory() {
     // overwriting directories doesn't work on windows
     if cfg!(target_os="windows") {
@@ -1023,7 +1023,7 @@ fn modify_delete_directory() {
 // consistent failures on macOS CI — ignored for now
 // https://github.com/passcod/notify/issues/124
 #[test]
-#[cfg(not(target_os = "macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn move_in_directory_watch_subdirectories() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -1052,7 +1052,7 @@ fn move_in_directory_watch_subdirectories() {
 
 // https://github.com/passcod/notify/issues/129
 #[test]
-#[cfg(not(target_os = "macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn rename_create_remove_temp_file() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -1076,7 +1076,7 @@ fn rename_create_remove_temp_file() {
 }
 
 #[test]
-#[cfg(not(target_os = "macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn rename_rename_remove_temp_file() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 

diff --git a/tests/notify.rs b/tests/notify.rs
@@ -94,7 +94,7 @@ fn write_file() {
 }
 
 #[test]
-#[cfg(not(any(target_os="windows", target_os="macos")))]
+#[cfg_attr(any(target_os = "windows", target_os = "macos"), ignore)]
 fn modify_file() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -198,7 +198,7 @@ fn rename_file() {
 }
 
 #[test]
-#[cfg(not(target_os="macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn move_out_create_file() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -237,7 +237,7 @@ fn move_out_create_file() {
 }
 
 #[test]
-#[cfg(not(any(target_os="windows", target_os="macos")))]
+#[cfg_attr(any(target_os = "windows", target_os = "macos"), ignore)]
 fn create_write_modify_file() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -389,6 +389,7 @@ fn create_directory() {
 
 // https://github.com/passcod/notify/issues/124
 #[test]
+#[cfg_attr(target_os = "macos", ignore)]
 fn create_directory_watch_subdirectories() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -434,7 +435,7 @@ fn create_directory_watch_subdirectories() {
 }
 
 #[test]
-#[cfg(not(any(target_os="windows", target_os="macos")))]
+#[cfg_attr(any(target_os = "windows", target_os = "macos"), ignore)]
 fn modify_directory() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -538,7 +539,7 @@ fn rename_directory() {
 }
 
 #[test]
-#[cfg(not(target_os="macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn move_out_create_directory() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -571,9 +572,9 @@ fn move_out_create_directory() {
 }
 
 // https://github.com/passcod/notify/issues/124
-// fails consistently on windows -- tbd?
+// fails consistently on windows, macos -- tbd?
 #[test]
-#[cfg_attr(target_os = "windows", ignore)]
+#[cfg_attr(any(target_os = "windows", target_os = "macos"), ignore)]
 fn move_in_directory_watch_subdirectories() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -615,7 +616,7 @@ fn move_in_directory_watch_subdirectories() {
 }
 
 #[test]
-#[cfg(not(target_os="windows"))]
+#[cfg_attr(target_os = "windows", ignore)]
 fn create_rename_overwrite_directory() {
     // overwriting directories doesn't work on windows
     if cfg!(target_os="windows") {

diff --git a/tests/watcher.rs b/tests/watcher.rs
@@ -380,7 +380,7 @@ fn watch_recursive_move() {
 }
 
 #[test]
-#[cfg(not(target_os="macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn watch_recursive_move_in() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -433,7 +433,7 @@ fn watch_recursive_move_in() {
 }
 
 #[test]
-#[cfg(not(target_os="macos"))]
+#[cfg_attr(target_os = "macos", ignore)]
 fn watch_recursive_move_out() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -851,7 +851,7 @@ fn unwatch_directory() {
 }
 
 #[test]
-#[cfg(not(target_os="windows"))]
+#[cfg_attr(target_os = "windows", ignore)]
 fn unwatch_nonexisting() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -920,7 +920,7 @@ fn self_delete_file() {
 }
 
 #[test]
-#[cfg(not(target_os="windows"))]
+#[cfg_attr(target_os = "windows", ignore)]
 fn self_delete_directory() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -984,7 +984,7 @@ fn self_delete_directory() {
 }
 
 #[test]
-#[cfg(not(target_os="windows"))]
+#[cfg_attr(target_os = "windows", ignore)]
 fn self_rename_file() {
     let tdir = TempDir::new("temp_dir").expect("failed to create temporary directory");
 
@@ -1227,7 +1227,7 @@ fn parent_rename_file() {
 }
 
 #[test]
-#[cfg(not(target_os="windows"))]
+#[cfg_attr(target_os = "windows", ignore)]
 fn parent_rename_directory() {
     // removing the parent directory doesn't work on windows
     if cfg!(target_os="windows") {