From 2055d30d8342404c43961c3ea0d5739993bd69ef Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Tue, 4 Feb 2020 17:44:04 -0500 Subject: [PATCH] updates --- .github/workflows/test_matrix.yml | 3 +++ tests/conftest.py | 2 +- tests/test_juniper_legacy.py | 2 +- tests/test_pfsense.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_matrix.yml b/.github/workflows/test_matrix.yml index 2db1634..3a6e462 100644 --- a/.github/workflows/test_matrix.yml +++ b/.github/workflows/test_matrix.yml @@ -30,6 +30,9 @@ jobs: run: | python -m pip install --upgrade pip pip install -r tests/requirements.txt + - name: Build + run: | + docker-compose -f test/docker-compose.yml build - name: Test with pytest run: | pip install pytest diff --git a/tests/conftest.py b/tests/conftest.py index 9498ec7..82a62d2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -153,7 +153,7 @@ def splunk_docker(request, docker_services, docker_ip): } docker_services.wait_until_responsive( - timeout=180.0, pause=0.5, check=lambda: is_responsive_splunk(splunk) + timeout=300.0, pause=1.0, check=lambda: is_responsive_splunk(splunk) ) return splunk diff --git a/tests/test_juniper_legacy.py b/tests/test_juniper_legacy.py index f9696d9..afe147e 100644 --- a/tests/test_juniper_legacy.py +++ b/tests/test_juniper_legacy.py @@ -111,7 +111,7 @@ def test_juniper_netscreen_fw_singleport(record_property, setup_wordlist, get_ho "{{ mark }} {% now 'utc', '%b %d %H:%M:%S' %} {{ host }} ns204: NetScreen device_id=netscreen2 [Root]system-notification-00257(traffic): start_time=\"2009-03-18 16:07:06\" duration=0 policy_id=320001 service=msrpc Endpoint Mapper(tcp) proto=6 src zone=Null dst zone=self action=Deny sent=0 rcvd=16384 src=21.10.90.125 dst=23.16.1.1 singleport=5000\n") message = mt.render(mark="<23>", host=host) - sendsingle(message, setup_sc4s[0], setup_sc4s[1][5000]) + sendsingle(message, host=setup_sc4s[0], port=setup_sc4s[1][5000]) st = env.from_string("search index=netfw host=\"{{ host }}\" sourcetype=\"netscreen:firewall\" | head 2") search = st.render(host=host) diff --git a/tests/test_pfsense.py b/tests/test_pfsense.py index 2f8ee6a..e2d027b 100644 --- a/tests/test_pfsense.py +++ b/tests/test_pfsense.py @@ -18,7 +18,7 @@ def test_pfsense_filterlog(record_property, setup_wordlist, setup_splunk, setup_ mt = env.from_string( "{{mark}}{% now 'utc', '%b %d %H:%M:%S' %} filterlog: 82,,,1000002666,mvneta2,match,pass,out,6,0x00,0x00000,64,ICMPv6,58,8,{{key}},\n") message = mt.render(mark="<27>", key=host) - sendsingle(message, setup_sc4s[0], setup_sc4s[1][5006]) + sendsingle(message, host=setup_sc4s[0], port=setup_sc4s[1][5006]) st = env.from_string("search index=netfw sourcetype=pfsense:filterlog \"{{key}}\" earliest=-2m | head 2") search = st.render(key=host) @@ -58,7 +58,7 @@ def test_pfsense_syslogd(record_property, setup_wordlist, setup_splunk, setup_sc mt = env.from_string( "{{mark}}{% now 'utc', '%b %d %H:%M:%S' %} syslogd: restart {{key}}\n") message = mt.render(mark="<27>", key=host) - sendsingle(message, setup_sc4s[0], setup_sc4s[1][5006]) + sendsingle(message, host=setup_sc4s[0], port=setup_sc4s[1][5006]) st = env.from_string("search index=netops sourcetype=pfsense:syslogd \"{{key}}\" earliest=-2m | head 2") search = st.render(key=host)