From 6e2183f0b697bc24392dc741c68126bc84f00eed Mon Sep 17 00:00:00 2001 From: Janonymous Date: Thu, 15 Jun 2017 09:03:50 +0000 Subject: [PATCH] Stopping Thread from oslo_service Change-Id: I51b3db7c0fb7eafcd35f0e4f866b43037c2cbc76 Closes-bug: #1693140 --- kuryr_kubernetes/tests/unit/test_watcher.py | 2 +- kuryr_kubernetes/watcher.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kuryr_kubernetes/tests/unit/test_watcher.py b/kuryr_kubernetes/tests/unit/test_watcher.py index 7be9d7dd3..c643c3125 100644 --- a/kuryr_kubernetes/tests/unit/test_watcher.py +++ b/kuryr_kubernetes/tests/unit/test_watcher.py @@ -185,7 +185,7 @@ class TestWatcher(test_base.TestCase): watcher_obj._stop_watch(path) - m_th.kill.assert_called() + m_th.stop.assert_called() def test_stop_watch_idle(self): path = '/test' diff --git a/kuryr_kubernetes/watcher.py b/kuryr_kubernetes/watcher.py index b63957057..a461c912f 100644 --- a/kuryr_kubernetes/watcher.py +++ b/kuryr_kubernetes/watcher.py @@ -130,7 +130,7 @@ class Watcher(object): def _stop_watch(self, path): if self._idle.get(path): if self._thread_group: - self._watching[path].kill() + self._watching[path].stop() def _watch(self, path): try: