Resolved conflicts after pulling changes

1 files changed, 6 insertions, 1 deletions

diff --git a/test/requests/parametrized_test.py b/test/requests/parametrized_test.py
index abf98fce..50003850 100644
--- a/test/requests/parametrized_test.py
+++ b/test/requests/parametrized_test.py
@@ -1,5 +1,7 @@
 import logging
 import unittest
+from wqflask import app
+from utility.elasticsearch_tools import get_elasticsearch_connection, get_user_by_unique_column
 from elasticsearch import Elasticsearch, TransportError
 
 class ParametrizedTest(unittest.TestCase):
@@ -10,10 +12,11 @@ class ParametrizedTest(unittest.TestCase):
         self.es_url = es_url
 
     def setUp(self):
-        self.es = Elasticsearch([self.es_url])
+        self.es = get_elasticsearch_connection()
         self.es_cleanup = []
 
         es_logger = logging.getLogger("elasticsearch")
+        es_logger.setLevel(app.config.get("LOG_LEVEL"))
         es_logger.addHandler(
             logging.FileHandler("/tmp/es_TestRegistrationInfo.log"))
         es_trace_logger = logging.getLogger("elasticsearch.trace")
@@ -21,7 +24,9 @@ class ParametrizedTest(unittest.TestCase):
             logging.FileHandler("/tmp/es_TestRegistrationTrace.log"))
 
     def tearDown(self):
+        from time import sleep
         self.es.delete_by_query(
             index="users"
             , doc_type="local"
             , body={"query":{"match":{"email_address":"test@user.com"}}})
+        sleep(1)