From 10e1adb6808b79633049a48f751340b77d4d6052 Mon Sep 17 00:00:00 2001 From: Winterflower Date: Mon, 2 Dec 2019 20:31:53 +0100 Subject: [PATCH] Removes code duplication in test code --- eland/tests/setup_tests.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/eland/tests/setup_tests.py b/eland/tests/setup_tests.py index 3c7c616..5fc5d34 100644 --- a/eland/tests/setup_tests.py +++ b/eland/tests/setup_tests.py @@ -78,14 +78,7 @@ def _setup_test_nested(es): if __name__ == '__main__': # Create connection to Elasticsearch - use defaults print('Connecting to ES', ELASTICSEARCH_HOST) - TEST_SUITE = os.environ.get('TEST_SUITE') - if TEST_SUITE == 'xpack': - print('Running xpack tests requires SSL. Setting up SSL enabled client') - certpath = os.path.join(os.path.dirname(__file__), '../../.ci/certs/ca.crt') - print(certpath) - es = Elasticsearch(ELASTICSEARCH_HOST, use_ssl=True, verify_certs=True, ca_certs=certpath) - else: - es = Elasticsearch(ELASTICSEARCH_HOST) + es = ES_TEST_CLIENT _setup_data(es)