From 50420771ce3531248c779e52dbf61a2e4672f41c Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Thu, 3 Sep 2015 16:53:15 +0200 Subject: [PATCH] Retry when executing take_leader method. --- helpers/etcd.py | 2 +- tests/test_etcd.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helpers/etcd.py b/helpers/etcd.py index 226c500a..74ad36f8 100644 --- a/helpers/etcd.py +++ b/helpers/etcd.py @@ -211,7 +211,7 @@ class Etcd(AbstractDCS): @catch_etcd_errors def take_leader(self): - return self.client.set(self.client_path('/leader'), self._name, self.ttl) + return self.retry(self.client.set, self.client_path('/leader'), self._name, self.ttl) def attempt_to_acquire_leader(self): try: diff --git a/tests/test_etcd.py b/tests/test_etcd.py index 2f993f85..f5d65e5f 100644 --- a/tests/test_etcd.py +++ b/tests/test_etcd.py @@ -202,7 +202,7 @@ class TestClient(unittest.TestCase): self.assertRaises(urllib3.exceptions.TimeoutError, self.client._result_from_response, response) response.content = 'Exception' self.assertRaises(etcd.EtcdException, self.client._result_from_response, response) - response.content = '{}' + response.content = b'{}' self.assertRaises(etcd.EtcdException, self.client._result_from_response, response) def test__get_machines_cache_from_srv(self):