From 69b0c7141d641d7b3abd60cae22c2e4b01caa1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Mon, 20 Jan 2014 17:15:53 +0100 Subject: [PATCH] get_client() already returns a singleton instance --- test_elasticsearch/test_server/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test_elasticsearch/test_server/__init__.py b/test_elasticsearch/test_server/__init__.py index d5aedad0..cc820bc0 100644 --- a/test_elasticsearch/test_server/__init__.py +++ b/test_elasticsearch/test_server/__init__.py @@ -28,7 +28,7 @@ def get_client(): client = Elasticsearch([os.environ.get('TEST_ES_SERVER', {})], **kw) # wait for yellow status - for _ in range(200): + for _ in range(100): time.sleep(.1) try: client.cluster.health(wait_for_status='yellow') @@ -49,11 +49,8 @@ def _get_version(version_string): return tuple(int(v) if v.isdigit() else 999 for v in version) class ElasticTestCase(TestCase): - client = None def setUp(self): - if ElasticTestCase.client is None: - ElasticTestCase.client = get_client() - self.client = ElasticTestCase.client + self.client = get_client() def tearDown(self): self.client.indices.delete('*')