From fba591f7c63f7d6b4b86bccae5e35ce9f568679d Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Fri, 7 Feb 2020 11:56:51 -0500 Subject: [PATCH] updates --- demo-with-compose.sh | 4 ++++ tests/entrypoint.sh | 7 +------ tests/pytest-ci.ini | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo-with-compose.sh b/demo-with-compose.sh index 804ee8e..9e5dbac 100755 --- a/demo-with-compose.sh +++ b/demo-with-compose.sh @@ -5,6 +5,10 @@ #license that can be found in the LICENSE-BSD2 file or at #https://opensource.org/licenses/BSD-2-Clause docker-compose -f tests/docker-compose-script.yml build +docker-compose -f tests/docker-compose-script.yml up -d splunk +sleep 60 +docker-compose -f tests/docker-compose-script.yml up -d sc4s +sleep 5 docker-compose -f tests/docker-compose-script.yml up EXIT=$0 diff --git a/tests/entrypoint.sh b/tests/entrypoint.sh index 0dc3697..157ddcc 100755 --- a/tests/entrypoint.sh +++ b/tests/entrypoint.sh @@ -1,9 +1,4 @@ #!/bin/sh cd /work -pytest -v \ - --splunk_type=external \ - --splunk_password=${SPLUNK_PASSWORD} \ - --sc4s_host=sc4s \ - --splunk_host=splunk \ - --junitxml=/work/test-results/test.xml $@ +pytest $@ diff --git a/tests/pytest-ci.ini b/tests/pytest-ci.ini index df69bcb..b20b9c4 100644 --- a/tests/pytest-ci.ini +++ b/tests/pytest-ci.ini @@ -5,6 +5,7 @@ addopts = -v --splunk_host=splunk --sc4s_host=sc4s --maxfail=5 + --junitxml=/work/test-results/test.xml junit_family=xunit1 filterwarnings = ignore::DeprecationWarning