From 58f747b9554fc3bf73bb97f83034e7084a8a7a65 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 3 May 2016 17:19:29 +0100
Subject: [PATCH] Forcibly delete ELASTICSEARCH_URL from environment to skip
 those tests unless --elasticsearch specified

---
 runtests.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/runtests.py b/runtests.py
index c9bcbbba25..ae3d100556 100755
--- a/runtests.py
+++ b/runtests.py
@@ -49,6 +49,9 @@ def runtests():
 
     if args.elasticsearch:
         os.environ.setdefault('ELASTICSEARCH_URL', 'http://localhost:9200')
+    elif 'ELASTICSEARCH_URL' in os.environ:
+        # forcibly delete the ELASTICSEARCH_URL setting to skip those tests
+        del os.environ['ELASTICSEARCH_URL']
 
     argv = [sys.argv[0], 'test'] + args.rest
     try: