From 944cb6f4257bcd2c36c39e62d18ba4fb94a46c3d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 4 Mar 2019 18:30:29 -0500
Subject: [PATCH] switch to testtools-compatible skips

---
 src/allmydata/test/test_inotify.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/allmydata/test/test_inotify.py b/src/allmydata/test/test_inotify.py
index 77ea97fa9..c14669b64 100644
--- a/src/allmydata/test/test_inotify.py
+++ b/src/allmydata/test/test_inotify.py
@@ -116,6 +116,11 @@ class INotifyTests(AsyncTestCase):
         return self._notificationTest(inotify.IN_CLOSE_WRITE, operation)
 
 
+    # The watchdog implementation makes it difficult to get this event.  Also,
+    # the magic-folder implementation doesn't really *need* exactly this
+    # event.  It would be nice to get some event on move, which watchdog gives
+    # us.  But this test is overly specific for our purposes.
+    @skip("not available on watchdog")
     def test_movedFrom(self):
         """
         Moving a file out of a monitored directory sends an
@@ -126,13 +131,10 @@ class INotifyTests(AsyncTestCase):
             path.moveTo(filepath.FilePath(self.mktemp()))
 
         return self._notificationTest(inotify.IN_MOVED_FROM, operation)
-    # The watchdog implementation makes it difficult to get this event.  Also,
-    # the magic-folder implementation doesn't really *need* exactly this
-    # event.  It would be nice to get some event on move, which watchdog gives
-    # us.  But this test is overly specific for our purposes.
-    test_movedFrom.skip = "not available on watchdog"
 
 
+    # Ditto the comment on test_movedFrom about watchdog here.
+    @skip("not available on watchdog")
     def test_movedTo(self):
         """
         Moving a file into a monitored directory sends an
@@ -144,8 +146,6 @@ class INotifyTests(AsyncTestCase):
             p.moveTo(path)
 
         return self._notificationTest(inotify.IN_MOVED_TO, operation)
-    # Ditto the comment on test_movedFrom about watchdog here.
-    test_movedTo.skip = "not available on watchdog"
 
 
     def test_delete(self):
@@ -274,6 +274,7 @@ class INotifyTests(AsyncTestCase):
         return d
 
 
+    @skip("Not gonna implement autoAdd")
     def test_complexSubdirectoryAutoAdd(self):
         """
         L{inotify.INotify} with autoAdd==True for a watched path
@@ -319,4 +320,3 @@ class INotifyTests(AsyncTestCase):
             filename.setContent(
                 filename.path.encode(sys.getfilesystemencoding()))
         return d
-    test_complexSubdirectoryAutoAdd.skip = "Not gonna implement autoAdd"