Forcibly delete ELASTICSEARCH_URL from environment to skip those tests unless --elasticsearch specified

Conflicts:
	runtests.py
This commit is contained in:
Matt Westcott 2016-05-03 17:19:29 +01:00
parent e3fbe06f81
commit a171cb0743

View file

@ -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: