Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
rfaircloth-splunk committed Feb 7, 2020
1 parent 7a47874 commit fba591f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 4 additions & 0 deletions demo-with-compose.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 1 addition & 6 deletions tests/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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 $@
1 change: 1 addition & 0 deletions tests/pytest-ci.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fba591f

Please sign in to comment.