From 9b3427cf52a117a4139050b29fff8bf8920c61c1 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Wed, 5 Feb 2020 19:37:09 -0500 Subject: [PATCH] test --- tests/conftest.py | 6 +++--- tests/entrypoint.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index cc7194d..dfec407 100644 --- 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 index fc6a258..8559e00 100755 --- 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 $@