From 8647a52b58a8afa61eb1ba32aaf669a22497e857 Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Tue, 3 Jun 2014 13:15:28 -0700 Subject: [PATCH 1/2] Reduce expected callback call_count in Watcher integration tests. --- nd_service_registry/version.py | 2 +- nd_service_registry/watcher_integration.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nd_service_registry/version.py b/nd_service_registry/version.py index 56e7c71..4bf09ed 100644 --- a/nd_service_registry/version.py +++ b/nd_service_registry/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = '0.3.0a2' # http://semver.org/ +__version__ = '0.3.0' # http://semver.org/ diff --git a/nd_service_registry/watcher_integration.py b/nd_service_registry/watcher_integration.py index 34261e7..eb21ef9 100644 --- a/nd_service_registry/watcher_integration.py +++ b/nd_service_registry/watcher_integration.py @@ -149,12 +149,12 @@ def get_data(): self.zk.set(path, value='%s' % i) waituntil(get_data, {'string_value': '%s' % i}, timeout=5, mode=2) - # The right number of calls is 7. There are a few upfront calls when + # The right number of calls is 6. There are a few upfront calls when # the Watcher object is initialized, and after that there are a few # calls for the updated node-data when new children are added. The # call count would be MUCH higher (11++) if we were recursively # creating Watches though. - self.assertEquals(7, len(callback_checker.test.mock_calls)) + self.assertEquals(6, len(callback_checker.test.mock_calls)) def test_deleting_node_watcher_is_watching(self): # Create our test path From dc10ca9194ebb641e2eb185d7473464e55ae2c25 Mon Sep 17 00:00:00 2001 From: Matt Wise Date: Tue, 3 Jun 2014 13:45:54 -0700 Subject: [PATCH 2/2] Pep8 cleanup --- nd_service_registry/watcher_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nd_service_registry/watcher_tests.py b/nd_service_registry/watcher_tests.py index 33be0ef..7b4b5a9 100644 --- a/nd_service_registry/watcher_tests.py +++ b/nd_service_registry/watcher_tests.py @@ -42,7 +42,7 @@ def test_execute_callbacks(self): # Execute the callback method several times. It sohuld only fire off # once for i in xrange(0, 5): - self.watch._execute_callbacks() + self.watch._execute_callbacks() # Executing the callbacks should happen only when the data changes. self.assertEquals(1, self.callback_watcher.test.call_count)