Tests: Add tests for polling FSMonitor

tests/test_1_create_delete.py

@@ -1,6 +1,7 @@
 import os, time
 from utils import *
 from fsmonitor import *
+from fsmonitor.polling import FSMonitor as PollingFSMonitor
 
 def test_1_create_delete():
     fsm_test = FSMonitorTest()
@@ -12,3 +13,14 @@ def test_1_create_delete():
 
     assert fsm_test.event_happened(FSEvent.Create, "x")
     assert fsm_test.event_happened(FSEvent.Delete, "x")
+
+def test_1_create_delete_polling():
+    fsm_test = FSMonitorTest(PollingFSMonitor)
+    w = fsm_test.add_dir_watch(tempdir)
+    touch(get_testpath("x"))
+    remove(get_testpath("x"))
+
+    time.sleep(0.1)
+
+    assert fsm_test.event_happened(FSEvent.Create, "x")
+    assert fsm_test.event_happened(FSEvent.Delete, "x")

tests/test_2_create_not_delete.py

@@ -1,6 +1,7 @@
 import os, time
 from utils import *
 from fsmonitor import *
+from fsmonitor.polling import FSMonitor as PollingFSMonitor
 
 def test_2_create_not_delete():
     fsm_test = FSMonitorTest()
@@ -13,3 +14,15 @@ def test_2_create_not_delete():
 
     assert fsm_test.event_happened(FSEvent.Create, "x")
     assert not fsm_test.event_happened(FSEvent.Delete, "x")
+
+def test_2_create_not_delete_polling():
+    fsm_test = FSMonitorTest(PollingFSMonitor)
+    w = fsm_test.add_dir_watch(tempdir)
+    touch(get_testpath("x"))
+    fsm_test.remove_watch(w)
+    remove(get_testpath("x"))
+
+    time.sleep(0.1)
+
+    assert fsm_test.event_happened(FSEvent.Create, "x")
+    assert not fsm_test.event_happened(FSEvent.Delete, "x")

tests/test_3_errorno_enoent.py

@@ -2,6 +2,7 @@
 from utils import *
 from fsmonitor import *
 from fsmonitor.compat import PY3
+from fsmonitor.polling import FSMonitor as PollingFSMonitor
 
 def test_3_errorno_enoent():
     fsm_test = FSMonitorTest()
@@ -14,3 +15,15 @@ def test_3_errorno_enoent():
         assert e.errno == err_code
     else:
         assert False, "Expected exception"
+
+def test_3_errorno_enoent_polling():
+    fsm_test = FSMonitorTest(PollingFSMonitor)
+    err_code = errno.ENOENT
+    if PY3 and sys.platform == "win32":
+        err_code = errno.ESRCH
+    try:
+        fsm_test.add_dir_watch("/this/path/does/not/exist")
+    except FSMonitorError as e:
+        assert e.errno == err_code
+    else:
+        assert False, "Expected exception"

tests/utils.py

@@ -2,8 +2,9 @@
 from fsmonitor import FSMonitorThread
 
 class FSMonitorTest(object):
-    def __init__(self):
-        self.monitor = FSMonitorThread(self.__callback)
+    def __init__(self, fsmonitor_class=None):
+        self.monitor = FSMonitorThread(self.__callback,
+                                       fsmonitor_class=fsmonitor_class)
         self._lock = threading.Lock()
         self._events = []