From f603a834caa001e7fe1082addbd6417d6b9021f5 Mon Sep 17 00:00:00 2001 From: Honza Kral Date: Wed, 28 Aug 2013 19:24:11 +0200 Subject: [PATCH] Use one global client instance for all test runs --- test_elasticsearch/test_server/__init__.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test_elasticsearch/test_server/__init__.py b/test_elasticsearch/test_server/__init__.py index 0fd5ebf5..b8a3e836 100644 --- a/test_elasticsearch/test_server/__init__.py +++ b/test_elasticsearch/test_server/__init__.py @@ -84,12 +84,15 @@ def teardown(): server.wait() class ElasticTestCase(TestCase): + client = None def setUp(self): - kw = {} - if 'TEST_ES_CONNECTION' in os.environ: - from elasticsearch import connection - kw['connection_class'] = getattr(connection, os.environ['TEST_ES_CONNECTION']) - self.client = Elasticsearch([os.environ['TEST_ES_SERVER']], **kw) + if ElasticTestCase.client is None: + kw = {} + if 'TEST_ES_CONNECTION' in os.environ: + from elasticsearch import connection + kw['connection_class'] = getattr(connection, os.environ['TEST_ES_CONNECTION']) + ElasticTestCase.client = Elasticsearch([os.environ['TEST_ES_SERVER']], **kw) + self.client = ElasticTestCase.client def tearDown(self): self.client.indices.delete()