cleaning up

Author: caseylitton

src/snovault/tests/elasticsearch_fixture.py

@@ -7,6 +7,15 @@
     import subprocess
 
 
+# These are set in .circleci/config
+CIRCLE_BUILD = os.environ.get('BASH_ENV') == '/home/circleci/.bashrc'
+CICLE_ES_VERSION = os.environ.get('ES_MAJOR_VERSION')
+
+
+def _get_args_and_env():
+    pass
+
+
 def server_process(
         datadir,
         configdir=None,
@@ -16,8 +25,8 @@ def server_process(
         prefix='',
         version=5,
     ):
+    env = os.environ.copy()
     if configdir:
-        env = os.environ.copy()
         # How elasticsearch 6+ sets config path
         env["ES_PATH_CONF"] = configdir
         args = [
@@ -26,13 +35,6 @@ def server_process(
         if version <= 5:
             # How elasticsearch 5 sets config path
             args.append(f"-Epath.conf={configdir}")
-        process = subprocess.Popen(
-            args,
-            close_fds=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            env=env,
-        )
     else:
         args = [
             os.path.join(prefix, 'elasticsearch'),
@@ -42,12 +44,13 @@ def server_process(
             '-Epath.logs=%s' % os.path.join(datadir, 'logs'),
             '-Epath.conf=./conf',
         ]
-        process = subprocess.Popen(
-            args,
-            close_fds=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-        )
+    process = subprocess.Popen(
+        args,
+        close_fds=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        env=env,
+    )
 
     SUCCESS_LINE = b'started\n'
     lines = []