diff options
| -rw-r--r-- | kazoo/recipe/watchers.py | 2 | ||||
| -rw-r--r-- | kazoo/tests/test_watchers.py | 34 |
2 files changed, 36 insertions, 0 deletions
diff --git a/kazoo/recipe/watchers.py b/kazoo/recipe/watchers.py index ea9516c..96ec4fe 100644 --- a/kazoo/recipe/watchers.py +++ b/kazoo/recipe/watchers.py @@ -341,6 +341,8 @@ class ChildrenWatch(object): if result is False: self._stopped = True self._func = None + if self._allow_session_lost: + self._client.remove_listener(self._session_watcher) except Exception as exc: log.exception(exc) raise diff --git a/kazoo/tests/test_watchers.py b/kazoo/tests/test_watchers.py index e08751e..35f34b5 100644 --- a/kazoo/tests/test_watchers.py +++ b/kazoo/tests/test_watchers.py @@ -418,6 +418,40 @@ class KazooChildrenWatcherTests(KazooTestCase): update.wait(0.5) eq_(all_children, ['smith']) + def test_child_watcher_remove_session_watcher(self): + update = threading.Event() + all_children = ['fred'] + + fail_through = [] + + def changed(children): + while all_children: + all_children.pop() + all_children.extend(children) + update.set() + if fail_through: + return False + + children_watch = self.client.ChildrenWatch(self.path, changed) + session_watcher = children_watch._session_watcher + + update.wait(10) + eq_(session_watcher in self.client.state_listeners, True) + eq_(all_children, []) + update.clear() + + fail_through.append(True) + self.client.create(self.path + '/' + 'smith') + update.wait(10) + eq_(session_watcher not in self.client.state_listeners, True) + eq_(all_children, ['smith']) + update.clear() + + self.client.create(self.path + '/' + 'george') + update.wait(10) + eq_(session_watcher not in self.client.state_listeners, True) + eq_(all_children, ['smith']) + def test_child_watch_session_loss(self): update = threading.Event() all_children = ['fred'] |