From 95f42df6db01e8b09295aee8565dc857663a34d8 Mon Sep 17 00:00:00 2001
From: Honza Kral <honza.kral@gmail.com>
Date: Fri, 12 Jul 2013 18:08:51 +0200
Subject: [PATCH] Support running the integration tests on an already running
 cluster

---
 test_elasticsearch/test_server/__init__.py    | 19 +++++++++++++------
 test_elasticsearch/test_server/test_common.py |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/test_elasticsearch/test_server/__init__.py b/test_elasticsearch/test_server/__init__.py
index 4541bcfa..cf1b4ffc 100644
--- a/test_elasticsearch/test_server/__init__.py
+++ b/test_elasticsearch/test_server/__init__.py
@@ -5,6 +5,9 @@ import os
 
 import requests
 
+from elasticsearch import Elasticsearch
+from elasticsearch.exceptions import ConnectionError
+
 from unittest import SkipTest
 
 data_dir = None
@@ -27,10 +30,15 @@ server = None
 pidfile = tempfile.mktemp()
 
 def setup():
+    # no integration tests, skip starting the server
     if 'YAML_TEST_DIR' not in os.environ:
         raise SkipTest('')
     global server
 
+    # use running ES instance, don't attempt to start our own
+    if 'TEST_ES_SERVER' in os.environ:
+        return
+
     # check installed
     if subprocess.call('which vim >/dev/null 2>&1', shell=True) != 0:
         raise SkipTest("No Elasticsearch server, skipping integration tests.")
@@ -54,18 +62,17 @@ def setup():
     cmd = CMD % args
 
     server = subprocess.Popen(cmd, shell=True)
+    os.environ['TEST_ES_SERVER'] = 'localhost:%(port)s' % args
+    client = Elasticsearch([os.environ['TEST_ES_SERVER']])
 
     # wait for green status
     for _ in range(100):
-        response = None
         time.sleep(.1)
         try:
-            response = requests.get('http://localhost:%(port)s/_cluster/health?wait_for_status=green' % args)
-        except requests.ConnectionError:
-            continue
-
-        if response.status_code == 200:
+            client.cluster.health(wait_for_status='yellow')
             break
+        except ConnectionError:
+            continue
 
     else:
         # timeout
diff --git a/test_elasticsearch/test_server/test_common.py b/test_elasticsearch/test_server/test_common.py
index c47460ce..067ef3f6 100644
--- a/test_elasticsearch/test_server/test_common.py
+++ b/test_elasticsearch/test_server/test_common.py
@@ -34,7 +34,7 @@ class YamlTestCase(TestCase):
         return ES_VERSION
 
     def setUp(self):
-        self.client = Elasticsearch(['localhost:9900'])
+        self.client = Elasticsearch([environ['TEST_ES_SERVER']])
         self.last_response = None
         self._state = {}