updates

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

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,6 +70,7 @@ test: &test
     - run:
         name: test
         command: |
+          docker-compose -f tests/docker-compose.yml pull
           docker-compose -f tests/docker-compose.yml up --abort-on-container-exit
           docker cp results:/* test-results/
         no_output_timeout: 1h

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -181,7 +181,7 @@ def sc4s_docker(request, docker_services, docker_ip):
 @pytest.fixture(scope="session")
 def sc4s_external(request):
     ports = {514: 514}
-    for x in range(4999, 5050):
+    for x in range(5000, 5050):
         ports.update({x: x})
 
     return request.config.getoption('sc4s_host'), ports

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - SPLUNK_USER=admin
       - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
       - SPLUNK_HOST=splunk
-      - SYSLOG_HOST=sc4s
+      - docke=sc4s
     volumes:
       - results:/work/test-results
 

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