From a171cb07439563a7c24f0584e8dd010112622779 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

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

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