Merge lp:~jelmer/brz/pyinotify-feature into lp:brz/3.1

[Jelmer Vernooij]

Skip pyinotify tests if pyinotify is missing.

Skip pyinotify tests if pyinotify is missing.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/268/

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2019-05-28 21:46:09 +0000
+++ breezy/tests/features.py	2020-08-06 22:03:18 +0000
@@ -407,6 +407,8 @@
 lsprof_feature = ModuleAvailableFeature('breezy.lsprof')
 pkg_resources_feature = ModuleAvailableFeature('pkg_resources')
 
+pyinotify = ModuleAvailableFeature('pyinotify')
+
 
 class _BackslashDirSeparatorFeature(Feature):
 

=== modified file 'breezy/tests/test_workspace.py'
--- breezy/tests/test_workspace.py	2020-07-27 22:32:15 +0000
+++ breezy/tests/test_workspace.py	2020-08-06 22:03:18 +0000
@@ -19,6 +19,7 @@
 from . import (
     TestCaseWithTransport,
     multiply_scenarios,
+    features,
     )
 from .scenarios import load_tests_apply_scenarios
 
@@ -117,6 +118,11 @@
         vary_by_format(),
     )
 
+    def setUp(self):
+        super(WorkspaceTests, self).setUp()
+        if self._use_inotify:
+            self.requireFeature(features.pyinotify)
+
     def test_root_add(self):
         tree = self.make_branch_and_tree('.', format=self._format)
         with Workspace(tree, use_inotify=self._use_inotify) as ws: