[tests] Fix flakey watch deletion test for FSEvents (#891)

* maintain log level during test * update changelog
gorakhargosh · May 20, 2022 · 5e5cb4a · 5e5cb4a
1 parent 68ef624
commit 5e5cb4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/changelog.rst b/changelog.rst
@@ -8,8 +8,8 @@ Unreleased
 
 2022-xx-xx • `full history <https://github.com/gorakhargosh/watchdog/compare/v2.1.8...HEAD>`__
 
-- 
-- Thanks to our beloved contributors: @
+- [fsevents] Fix flakey test to assert that there are no errors when stopping the emitter.
+- Thanks to our beloved contributors: @samschott
 
 2.1.8
 ~~~~~

diff --git a/tests/test_fsevents.py b/tests/test_fsevents.py
@@ -169,19 +169,20 @@ def stop(em):
         th2 = Thread(target=stop, args=(emitter,))
 
         try:
-            with caplog.at_level(logging.ERROR):
-                th1.start()
-                th2.start()
-                th1.join()
-                th2.join()
-                assert not caplog.records
+            th1.start()
+            th2.start()
+            th1.join()
+            th2.join()
         finally:
             emitter.stop()
 
     # 20 attempts to make the random failure happen
-    for _ in range(20):
-        try_to_fail()
-        sleep(random())
+    with caplog.at_level(logging.ERROR):
+        for _ in range(20):
+            try_to_fail()
+            sleep(random())
+
+        assert not caplog.records
 
 
 def test_remove_watch_twice():