diff --git a/tests/test_config_reload.py b/tests/test_config_reload.py index aaab4ca1..67d25877 100644 --- a/tests/test_config_reload.py +++ b/tests/test_config_reload.py @@ -207,12 +207,17 @@ def add_watcher_events(p, *args, **kwargs): return +def clear_events(): + global access_log + with access_lock: + access_log = [] + + class TestConfigReload(TestCase): def assertAccessEvents(self, *args): - global access_log with access_lock: self.assertEqual(set(access_log), set(args)) - access_log = [] + clear_events() def test_noreload(self): with get_powerline(run_once=True) as p: @@ -228,7 +233,7 @@ class TestConfigReload(TestCase): # Without the following assertion test_reload_colors may fail for # unknown reason (with AssertionError telling about “config” accessed # one more time then needed) - self.assertAccessEvents() + clear_events() def test_reload_main(self): with get_powerline(run_once=False) as p: @@ -281,7 +286,7 @@ class TestConfigReload(TestCase): self.assertEqual(p.render(), '<2 3 1> t <3 4 False>>><1 4 4>b <4 False False>>>') self.assertEqual(p.logger._pop_msgs(), []) self.assertEqual(p.renderer.local_themes, 'something') - self.assertAccessEvents() + clear_events() def test_reload_unexistent(self): with get_powerline(run_once=False) as p: @@ -306,7 +311,7 @@ class TestConfigReload(TestCase): self.assertAccessEvents('colorschemes/test/nonexistentraise') self.assertEqual(p.render(), '<1 3 1> s<3 4 False>>><2 4 4>g<4 False False>>>') self.assertEqual(p.logger._pop_msgs(), []) - self.assertAccessEvents() + clear_events() def test_reload_colors(self): with get_powerline(run_once=False) as p: @@ -319,7 +324,7 @@ class TestConfigReload(TestCase): self.assertAccessEvents('colors') self.assertEqual(p.render(), '<5 2 1> s<2 4 False>>><3 4 4>g<4 False False>>>') self.assertEqual(p.logger._pop_msgs(), []) - self.assertAccessEvents() + clear_events() def test_reload_colorscheme(self): with get_powerline(run_once=False) as p: @@ -332,7 +337,7 @@ class TestConfigReload(TestCase): self.assertAccessEvents('colorschemes/test/default') self.assertEqual(p.render(), '<1 3 1> s<3 4 False>>><3 4 4>g<4 False False>>>') self.assertEqual(p.logger._pop_msgs(), []) - self.assertAccessEvents() + clear_events() def test_reload_theme(self): with get_powerline(run_once=False) as p: @@ -345,7 +350,7 @@ class TestConfigReload(TestCase): self.assertAccessEvents('themes/test/default') self.assertEqual(p.render(), '<1 2 1> col3<2 4 False>>><3 4 4>g<4 False False>>>') self.assertEqual(p.logger._pop_msgs(), []) - self.assertAccessEvents() + clear_events() replaces = {