From 09ed79e609bbd6cccf355f2a57323d84c3b1db8e Mon Sep 17 00:00:00 2001
From: rfaircloth-splunk <rfaircloth@splunk.com>
Date: Sat, 8 Feb 2020 11:06:02 -0500
Subject: [PATCH] updates

---
 pytest.ini               |  3 ++-
 tests/conftest.py        | 13 ++++++++-----
 tests/docker-compose.yml |  6 +++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index a7f0f6c..254a172 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,7 +3,8 @@ testpaths = tests
 addopts =
     -v --tb=long
     --splunk_type=docker
-    --maxfail=1    
+    --keepalive
+    --splunk_hec_token=1ec3c8ac-74b3-46f2-ba44-a7c96b6ab236
 filterwarnings =
     ignore::DeprecationWarning
 junit_family=xunit1
\ No newline at end of file
diff --git a/tests/conftest.py b/tests/conftest.py
index a2fc51e..e5429ee 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -158,11 +158,12 @@ def sc4s(request):
 
 
 @pytest.fixture(scope="session")
-def splunk_docker(request, docker_services, docker_ip):
+def splunk_docker(request, docker_services):
+    docker_services.start('splunk')
     port = docker_services.port_for("splunk", 8089)
 
     splunk = {
-        'host': docker_ip,
+        'host': docker_services.docker_ip,
         'port': port,
         'username': request.config.getoption('splunk_user'),
         'password': request.config.getoption('splunk_password'),
@@ -187,12 +188,14 @@ def splunk_external(request):
 
 
 @pytest.fixture(scope="session")
-def sc4s_docker(request, docker_services, docker_ip):
-    ports = { 514: docker_services.port_for("sc4s", 514) }
+def sc4s_docker(docker_services):
+    docker_services.start('sc4s')
+
+    ports = {514:  docker_services.port_for("sc4s", 514)}
     for x in range(5000, 5050):
         ports.update({ x: docker_services.port_for("sc4s", x)})
 
-    return docker_ip, ports
+    return docker_services.docker_ip, ports
 
 
 @pytest.fixture(scope="session")
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index e6ec6c7..34d8613 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -45,14 +45,18 @@ services:
       context: ../splunk
     hostname: splunk
     ports:
-      - "8000"
+      - "8000:8000"
       - "8088"
       - "8089"
     environment:
       - SPLUNK_HEC_TOKEN=${SPLUNK_HEC_TOKEN}
       - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
       - SPLUNK_START_ARGS=--accept-license
+    volumes:
+      - splunk-var:/opt/splunk/vars
 
 volumes:
   results:
+    external: false
+  splunk-var:
     external: false
\ No newline at end of file