test

CSVD · Feb 6, 2020 · 9b3427c · 9b3427c
1 parent b1358fb
commit 9b3427c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -130,14 +130,14 @@ def splunk(request):
 def sc4s(request):
     if request.config.getoption('splunk_type') == 'external':
         request.fixturenames.append('sc4s_external')
-        splunk = request.getfixturevalue("sc4s_external")
+        sc4s = request.getfixturevalue("sc4s_external")
     elif request.config.getoption('splunk_type') == 'docker':
         request.fixturenames.append('sc4s_docker')
-        splunk = request.getfixturevalue("sc4s_docker")
+        sc4s = request.getfixturevalue("sc4s_docker")
     else:
         raise Exception
 
-    yield splunk
+    yield sc4s
 
 
 @pytest.fixture(scope="session")

diff --git a/tests/entrypoint.sh b/tests/entrypoint.sh
@@ -4,6 +4,6 @@ cd /work
 pytest -v \
        --splunk_type=external \
        --splunk_password=${SPLUNK_PASSWORD} \
-       --sc4s_host=sc4s
-       --splunk_host=splunk
+       --sc4s_host=sc4s \
+       --splunk_host=splunk \
        --junitxml=/work/test-results/functional/functional.xml $@