From: Shivani Bhardwaj Date: Fri, 18 Aug 2023 13:07:57 +0000 (+0530) Subject: tests: deduplicate pcaps, cleanup extras X-Git-Tag: suricata-6.0.15~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65a187e936b95a5f815af6ceb0b0417e6087cb91;p=thirdparty%2Fsuricata-verify.git tests: deduplicate pcaps, cleanup extras Related to Redmine ticket 5908 --- diff --git a/tests/alert-max/alert-max-20/input.pcap b/tests/alert-max/alert-max-20/input.pcap deleted file mode 100644 index baa322b8c..000000000 Binary files a/tests/alert-max/alert-max-20/input.pcap and /dev/null differ diff --git a/tests/alert-max/alert-max-20/test.yaml b/tests/alert-max/alert-max-20/test.yaml index cd8540ce2..d385fbd87 100644 --- a/tests/alert-max/alert-max-20/test.yaml +++ b/tests/alert-max/alert-max-20/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-max/alert-max-default/input.pcap + args: - -k none diff --git a/tests/alert-testmyids-frames/input.pcap b/tests/alert-testmyids-frames/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/alert-testmyids-frames/input.pcap and /dev/null differ diff --git a/tests/alert-testmyids-frames/test.yaml b/tests/alert-testmyids-frames/test.yaml index 96ed7f0f9..d43579888 100644 --- a/tests/alert-testmyids-frames/test.yaml +++ b/tests/alert-testmyids-frames/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/alert-testmyids/input.pcap b/tests/alert-testmyids/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/alert-testmyids/input.pcap and /dev/null differ diff --git a/tests/alert-testmyids/test.yaml b/tests/alert-testmyids/test.yaml index b6ce41dc8..7aa89a48d 100644 --- a/tests/alert-testmyids/test.yaml +++ b/tests/alert-testmyids/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/app-layer-template-rust/input.pcap b/tests/app-layer-template-rust/input.pcap deleted file mode 100644 index 00abe264f..000000000 Binary files a/tests/app-layer-template-rust/input.pcap and /dev/null differ diff --git a/tests/app-layer-template-rust/test.yaml b/tests/app-layer-template-rust/test.yaml index 5254ddea4..762471f15 100644 --- a/tests/app-layer-template-rust/test.yaml +++ b/tests/app-layer-template-rust/test.yaml @@ -1,3 +1,5 @@ +pcap: ../app-layer-template/input.pcap + # *** Add configuration here *** requires: diff --git a/tests/base64-issue-5223-6/input.pcap b/tests/base64-issue-5223-6/input.pcap deleted file mode 100644 index 5ecd467d3..000000000 Binary files a/tests/base64-issue-5223-6/input.pcap and /dev/null differ diff --git a/tests/base64-issue-5223-6/test.yaml b/tests/base64-issue-5223-6/test.yaml index b21bf1ab4..f793e8f3d 100644 --- a/tests/base64-issue-5223-6/test.yaml +++ b/tests/base64-issue-5223-6/test.yaml @@ -1,3 +1,5 @@ +pcap: ../base64-issue-5223/input.pcap + requires: min-version: 6 diff --git a/tests/bug-1401-01/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap b/tests/bug-1401-01/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap deleted file mode 100644 index 33e84169d..000000000 Binary files a/tests/bug-1401-01/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap and /dev/null differ diff --git a/tests/bug-1401-01/test.yaml b/tests/bug-1401-01/test.yaml index 273617c3e..28e71aae7 100644 --- a/tests/bug-1401-01/test.yaml +++ b/tests/bug-1401-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata-01-alert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-1401-02/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap b/tests/bug-1401-02/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap deleted file mode 100644 index 33e84169d..000000000 Binary files a/tests/bug-1401-02/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap and /dev/null differ diff --git a/tests/bug-1401-02/test.yaml b/tests/bug-1401-02/test.yaml index 2bc44fe8a..6d7116cef 100644 --- a/tests/bug-1401-02/test.yaml +++ b/tests/bug-1401-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata-01-alert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-1401-04/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01.pcap b/tests/bug-1401-04/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01.pcap deleted file mode 100644 index 4c85f66ff..000000000 Binary files a/tests/bug-1401-04/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01.pcap and /dev/null differ diff --git a/tests/bug-1401-04/test.yaml b/tests/bug-1401-04/test.yaml index abe62baca..17622ff34 100644 --- a/tests/bug-1401-04/test.yaml +++ b/tests/bug-1401-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-1401-03/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-1450-02/test.yaml b/tests/bug-1450-02/test.yaml index 780ae4698..92028059a 100644 --- a/tests/bug-1450-02/test.yaml +++ b/tests/bug-1450-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-1450-05/tls_DER-incomplete-content.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-1450-02/tls_DER-incomplete-content.pcap b/tests/bug-1450-02/tls_DER-incomplete-content.pcap deleted file mode 100644 index 9283dd2df..000000000 Binary files a/tests/bug-1450-02/tls_DER-incomplete-content.pcap and /dev/null differ diff --git a/tests/bug-1450-03/test.yaml b/tests/bug-1450-03/test.yaml index 28e5e78e5..ae01467c3 100644 --- a/tests/bug-1450-03/test.yaml +++ b/tests/bug-1450-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-1450-04/tls_DER-incomplete-header.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-1450-03/tls_DER-incomplete-header.pcap b/tests/bug-1450-03/tls_DER-incomplete-header.pcap deleted file mode 100644 index 2d37ba638..000000000 Binary files a/tests/bug-1450-03/tls_DER-incomplete-header.pcap and /dev/null differ diff --git a/tests/bug-2558-01/2008.mp4.pcap b/tests/bug-2558-01/2008.mp4.pcap deleted file mode 100644 index 3f2cf5283..000000000 Binary files a/tests/bug-2558-01/2008.mp4.pcap and /dev/null differ diff --git a/tests/bug-2558-01/test.yaml b/tests/bug-2558-01/test.yaml index 7d7c55e9a..0d7ee7376 100644 --- a/tests/bug-2558-01/test.yaml +++ b/tests/bug-2558-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-2558-02/2008.mp4.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-3616/input.pcap b/tests/bug-3616/input.pcap deleted file mode 100644 index cc069dc98..000000000 Binary files a/tests/bug-3616/input.pcap and /dev/null differ diff --git a/tests/bug-3616/test.yaml b/tests/bug-3616/test.yaml index f06dcde78..dd8af63ee 100644 --- a/tests/bug-3616/test.yaml +++ b/tests/bug-3616/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-ips/input.pcap + requires: min-version: 6 diff --git a/tests/bug-4199-3/input.pcap b/tests/bug-4199-3/input.pcap deleted file mode 100644 index b9eec15c8..000000000 Binary files a/tests/bug-4199-3/input.pcap and /dev/null differ diff --git a/tests/bug-4199-3/test.yaml b/tests/bug-4199-3/test.yaml index 59fce2d42..5f7036da6 100644 --- a/tests/bug-4199-3/test.yaml +++ b/tests/bug-4199-3/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-4199-4/input.pcap + requires: min-version: 6 diff --git a/tests/bug-4199/input.pcap b/tests/bug-4199/input.pcap deleted file mode 100644 index b9eec15c8..000000000 Binary files a/tests/bug-4199/input.pcap and /dev/null differ diff --git a/tests/bug-4199/test.yaml b/tests/bug-4199/test.yaml index 59fce2d42..5f7036da6 100644 --- a/tests/bug-4199/test.yaml +++ b/tests/bug-4199/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-4199-4/input.pcap + requires: min-version: 6 diff --git a/tests/bug-4394-pdonly-drop/input.pcap b/tests/bug-4394-pdonly-drop/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/bug-4394-pdonly-drop/input.pcap and /dev/null differ diff --git a/tests/bug-4394-pdonly-drop/test.yaml b/tests/bug-4394-pdonly-drop/test.yaml index bdf2dde15..b5d696245 100644 --- a/tests/bug-4394-pdonly-drop/test.yaml +++ b/tests/bug-4394-pdonly-drop/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-5066-iponly-cidr-ordering-02/test-limit.pcap b/tests/bug-5066-iponly-cidr-ordering-02/test-limit.pcap deleted file mode 100644 index 60fa36e76..000000000 Binary files a/tests/bug-5066-iponly-cidr-ordering-02/test-limit.pcap and /dev/null differ diff --git a/tests/bug-5066-iponly-cidr-ordering-02/test.yaml b/tests/bug-5066-iponly-cidr-ordering-02/test.yaml index 10ee7458f..6d08c1c1a 100644 --- a/tests/bug-5066-iponly-cidr-ordering-02/test.yaml +++ b/tests/bug-5066-iponly-cidr-ordering-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5066-iponly-cidr-ordering-01/test-limit.pcap + requirements: min-version: 5 diff --git a/tests/bug-5066-iponly-cidr-ordering-03/test-limit.pcap b/tests/bug-5066-iponly-cidr-ordering-03/test-limit.pcap deleted file mode 100644 index 60fa36e76..000000000 Binary files a/tests/bug-5066-iponly-cidr-ordering-03/test-limit.pcap and /dev/null differ diff --git a/tests/bug-5066-iponly-cidr-ordering-03/test.yaml b/tests/bug-5066-iponly-cidr-ordering-03/test.yaml index 10ee7458f..6d08c1c1a 100644 --- a/tests/bug-5066-iponly-cidr-ordering-03/test.yaml +++ b/tests/bug-5066-iponly-cidr-ordering-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5066-iponly-cidr-ordering-01/test-limit.pcap + requirements: min-version: 5 diff --git a/tests/bug-5066-iponly-cidr-ordering-04/test-limit.pcap b/tests/bug-5066-iponly-cidr-ordering-04/test-limit.pcap deleted file mode 100644 index 60fa36e76..000000000 Binary files a/tests/bug-5066-iponly-cidr-ordering-04/test-limit.pcap and /dev/null differ diff --git a/tests/bug-5066-iponly-cidr-ordering-04/test.yaml b/tests/bug-5066-iponly-cidr-ordering-04/test.yaml index 10ee7458f..6d08c1c1a 100644 --- a/tests/bug-5066-iponly-cidr-ordering-04/test.yaml +++ b/tests/bug-5066-iponly-cidr-ordering-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5066-iponly-cidr-ordering-01/test-limit.pcap + requirements: min-version: 5 diff --git a/tests/bug-5066-iponly-cidr-ordering-05/test-limit.pcap b/tests/bug-5066-iponly-cidr-ordering-05/test-limit.pcap deleted file mode 100644 index 60fa36e76..000000000 Binary files a/tests/bug-5066-iponly-cidr-ordering-05/test-limit.pcap and /dev/null differ diff --git a/tests/bug-5066-iponly-cidr-ordering-05/test.yaml b/tests/bug-5066-iponly-cidr-ordering-05/test.yaml index 10ee7458f..6d08c1c1a 100644 --- a/tests/bug-5066-iponly-cidr-ordering-05/test.yaml +++ b/tests/bug-5066-iponly-cidr-ordering-05/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5066-iponly-cidr-ordering-01/test-limit.pcap + requirements: min-version: 5 diff --git a/tests/bug-5198.v6/input.pcap b/tests/bug-5198.v6/input.pcap deleted file mode 100644 index 6cfd80f9b..000000000 Binary files a/tests/bug-5198.v6/input.pcap and /dev/null differ diff --git a/tests/bug-5198.v6/test.yaml b/tests/bug-5198.v6/test.yaml index 811d464f4..a22475ef1 100644 --- a/tests/bug-5198.v6/test.yaml +++ b/tests/bug-5198.v6/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-flow-vlan/input.pcap + requires: lt-version: 7 features: diff --git a/tests/bug-5198/input.pcap b/tests/bug-5198/input.pcap deleted file mode 100644 index 6cfd80f9b..000000000 Binary files a/tests/bug-5198/input.pcap and /dev/null differ diff --git a/tests/bug-5198/test.yaml b/tests/bug-5198/test.yaml index 8cea23b73..e0b62d02d 100644 --- a/tests/bug-5198/test.yaml +++ b/tests/bug-5198/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-flow-vlan/input.pcap + requires: min-version: 7 features: diff --git a/tests/bug-5464-verdict-01/test.yaml b/tests/bug-5464-verdict-01/test.yaml index 79247bb9d..b6d8ce6d1 100644 --- a/tests/bug-5464-verdict-01/test.yaml +++ b/tests/bug-5464-verdict-01/test.yaml @@ -5,7 +5,7 @@ requires: args: - --simulate-ips -pcap: ../detect-app-layer-protocol-02/input.pcap +pcap: ../flowbit-oring/input.pcap checks: - filter: diff --git a/tests/bug-5464-verdict-02/test.yaml b/tests/bug-5464-verdict-02/test.yaml index 70f89eddc..188312bd0 100644 --- a/tests/bug-5464-verdict-02/test.yaml +++ b/tests/bug-5464-verdict-02/test.yaml @@ -1,7 +1,7 @@ args: - --simulate-ips -pcap: ../detect-app-layer-protocol-02/input.pcap +pcap: ../flowbit-oring/input.pcap checks: - filter: diff --git a/tests/bug-5464-verdict-04/test.yaml b/tests/bug-5464-verdict-04/test.yaml index e5c574443..39e34a5b2 100644 --- a/tests/bug-5464-verdict-04/test.yaml +++ b/tests/bug-5464-verdict-04/test.yaml @@ -1,4 +1,4 @@ -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - -k none diff --git a/tests/bug-5780-01-http2-header/http2_multiple_headers.pcap b/tests/bug-5780-01-http2-header/http2_multiple_headers.pcap deleted file mode 100644 index e549d266b..000000000 Binary files a/tests/bug-5780-01-http2-header/http2_multiple_headers.pcap and /dev/null differ diff --git a/tests/bug-5780-01-http2-header/test.yaml b/tests/bug-5780-01-http2-header/test.yaml index ae8d2f465..1c0f9bb11 100644 --- a/tests/bug-5780-01-http2-header/test.yaml +++ b/tests/bug-5780-01-http2-header/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5929-02/http2_multiple_headers.pcap + requires: min-version: 7 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/README.md index e5b9ef229..ddea1aaa6 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/README.md @@ -10,5 +10,5 @@ We expect to see no alerts nor ``http`` events logged, as the flow won't be insp # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/test.yaml index 4b261d71f..90bca43f9 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-bypass/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=false diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/README.md index ee05dc57e..349717bf9 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/README.md @@ -11,5 +11,5 @@ exception policy value for the midstream exception policy. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/test.yaml index ba4ea0a8a..6ae614407 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/README.md index 0b3064bce..5571aa7d0 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/README.md @@ -11,5 +11,5 @@ exception policy value for the midstream exception policy. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/test.yaml index 9d6f2a791..b6ce04a57 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-drop-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap requires: min-version: 7 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/README.md index 7d095f1df..5eac76498 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/README.md @@ -10,5 +10,5 @@ We expect to see no alerts nor ``http`` events logged, as the flow won't be insp # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/test.yaml index 107baf27c..0f221cd65 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-ignore/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=false diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/README.md index 2f4b00371..609396e76 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/README.md @@ -10,5 +10,5 @@ We expect to see no alerts nor ``http`` events logged, as the flow won't be insp # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/test.yaml index 16ec15262..aed67027e 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=false diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/README.md index 5787fb557..1c2cb4a87 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/README.md @@ -11,5 +11,5 @@ exception policy value for the midstream exception policy. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/test.yaml index 69b7c9ecf..08cd669d8 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-disabled-pass-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/README.md index d529c4fd5..72d962c26 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/README.md @@ -11,5 +11,5 @@ exception policy value when midstream picku-up sessions are enabled. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/test.yaml index b97ba9a0c..85f57387d 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-bypass/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/README.md index a8ee89490..48e7464a4 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/README.md @@ -11,5 +11,5 @@ exception policy value. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/test.yaml index 68b0a5c2e..122aacea9 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/README.md index a1cb018e6..b53045d3b 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/README.md @@ -11,5 +11,5 @@ exception policy value. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/test.yaml index c763c87af..b8541e0be 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-drop-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/README.md index 1fc93e140..51e098c93 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/README.md @@ -11,5 +11,5 @@ be inspected. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/test.yaml index 811d81927..783f49a6c 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-ignore/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=true diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/README.md index 1da1a6716..e294e25c5 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/README.md @@ -11,5 +11,5 @@ to see ``http`` events logged, as the flow will be inspected. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/test.yaml index f38c2e486..ddcb8130a 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=true diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/README.md index d44dcf04b..c32218bd8 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/README.md @@ -11,5 +11,5 @@ exception policy value for the midstream exception policy. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/test.yaml index 17add9cb2..a88eb5f40 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-pass-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/README.md index b117570af..12a4a08e6 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/README.md @@ -12,5 +12,5 @@ exception policy value when midstream picku-up sessions are enabled. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/test.yaml index 9493f3e8a..9a14543d6 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ids-midstream-enabled-reject/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/README.md index a5d51f3ff..90b07a8e4 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/README.md @@ -11,5 +11,5 @@ Flow will be bypassed. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/test.yaml index fdc4a7abd..9155b9a68 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-bypass/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --simulate-ips diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/README.md index 68d3f3c84..12684a815 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/README.md @@ -11,5 +11,5 @@ tracked. The flow should be dropped. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/test.yaml index 6ffed8e10..4ad62489e 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=false diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/README.md index dead8e80a..f67dfe1f8 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/README.md @@ -11,5 +11,5 @@ exception policy value for the midstream exception policy. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/test.yaml index d17970ed2..923738487 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-drop-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/README.md index bdfc0fd63..3d260011f 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/README.md @@ -10,5 +10,5 @@ We expect to see no alerts nor ``http`` events logged, as the flow won't be insp # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/test.yaml index 5644a200a..897282c96 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-ignore/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --simulate-ips diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/README.md index a99bf856c..c9d403a1d 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/README.md @@ -10,5 +10,5 @@ We expect to see no alerts nor ``http`` events logged, as the flow won't be insp # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/test.yaml index 590ee239f..1c72992de 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --simulate-ips diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/README.md index fc8f19521..ec92a8685 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/README.md @@ -12,5 +12,5 @@ exception policy value. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/test.yaml index 0ae92fa85..2c423b3a4 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-pass-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/README.md index 6b4fb2681..3c6be45c3 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/README.md @@ -12,5 +12,5 @@ rejected and dropped. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/test.yaml index f4e8ec99c..47472f0dd 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-disabled-reject/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --simulate-ips diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/README.md index 69e8049a1..4139954c3 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/README.md @@ -11,5 +11,5 @@ exception policy value when midstream picku-up sessions are enabled. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/test.yaml index fe98977a8..c80a1b48b 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-bypass/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/README.md index 5d53a2a45..ca79a3539 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/README.md @@ -11,5 +11,5 @@ exception policy value when midstream picku-up sessions are enabled. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/test.yaml index 79ff3f692..9722c16d6 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/README.md index 19cc6bc05..047f52cd8 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/README.md @@ -11,5 +11,5 @@ exception policy value when midstream picku-up sessions are enabled. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/test.yaml index 1df7f7c3e..b8c54d67a 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-drop-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/README.md index 72d59fc1c..89af1c044 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/README.md @@ -11,5 +11,5 @@ be inspected. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/test.yaml index 1e84c477b..baf9d283a 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-ignore/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --simulate-ips diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/README.md index 8415af9c5..2c196c735 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/README.md @@ -11,5 +11,5 @@ to see ``http`` events logged, as the flow will be inspected. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/test.yaml index ce12eb27c..e452ff51c 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-flow/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap args: - --simulate-ips diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/README.md index 0249bb5f8..9dece507f 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/README.md @@ -12,5 +12,5 @@ exception policy value. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/test.yaml index 0ae92fa85..2c423b3a4 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-pass-packet/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/README.md b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/README.md index 20bb610d2..eefe605df 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/README.md +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/README.md @@ -12,5 +12,5 @@ exception policy value when midstream picku-up sessions are enabled. # Pcap -Pcap comes from the test ``exception-policy-midstream-03`` and is the result of a +Pcap comes from the test ``alert-testmyids-midstream5`` and is the result of a curl to www.testmyids.com. diff --git a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/test.yaml b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/test.yaml index fe0ef682e..0782903d3 100644 --- a/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/test.yaml +++ b/tests/bug-5825-midstream-exception-policy/exception-policy-ips-midstream-enabled-reject/test.yaml @@ -1,4 +1,4 @@ -pcap: ../../exception-policy-midstream-03/input.pcap +pcap: ../../alert-testmyids-midstream5/input.pcap exit-code: 1 diff --git a/tests/bug-6109-reject-policy-ids/test.yaml b/tests/bug-6109-reject-policy-ids/test.yaml index 52f392e5b..3b18362e4 100644 --- a/tests/bug-6109-reject-policy-ids/test.yaml +++ b/tests/bug-6109-reject-policy-ids/test.yaml @@ -1,4 +1,4 @@ -pcap: ../exception-policy-midstream-03/input.pcap +pcap: ../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=false diff --git a/tests/bug-6149-exception-policy-auto-ids/test.yaml b/tests/bug-6149-exception-policy-auto-ids/test.yaml index 77f2756b2..46470fc6e 100644 --- a/tests/bug-6149-exception-policy-auto-ids/test.yaml +++ b/tests/bug-6149-exception-policy-auto-ids/test.yaml @@ -1,7 +1,7 @@ requires: min-version: 7 -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - -k none diff --git a/tests/bug-6149-exception-policy-auto-ips/test.yaml b/tests/bug-6149-exception-policy-auto-ips/test.yaml index b35b50d2d..66fd62a2d 100644 --- a/tests/bug-6149-exception-policy-auto-ips/test.yaml +++ b/tests/bug-6149-exception-policy-auto-ips/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG min-version: 7 -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - -k none diff --git a/tests/bug-78-http-uri/input.pcap b/tests/bug-78-http-uri/input.pcap deleted file mode 100644 index 6af7504c7..000000000 Binary files a/tests/bug-78-http-uri/input.pcap and /dev/null differ diff --git a/tests/bug-78-http-uri/test.yaml b/tests/bug-78-http-uri/test.yaml index e964a30c2..042e1a6ef 100644 --- a/tests/bug-78-http-uri/test.yaml +++ b/tests/bug-78-http-uri/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-78-uricontent/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/bug-856/input.pcap b/tests/bug-856/input.pcap deleted file mode 100644 index 6437471b0..000000000 Binary files a/tests/bug-856/input.pcap and /dev/null differ diff --git a/tests/bug-856/test.yaml b/tests/bug-856/test.yaml index bc722870c..e77f135c7 100644 --- a/tests/bug-856/test.yaml +++ b/tests/bug-856/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-z-flag-fp/suricatafpdnsdecoder.pcap + requires: min-version: 6 diff --git a/tests/classification-config-validate-02/input.pcap b/tests/classification-config-validate-02/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/classification-config-validate-02/input.pcap and /dev/null differ diff --git a/tests/classification-config-validate-02/test.yaml b/tests/classification-config-validate-02/test.yaml index 08a322993..fbf3292de 100644 --- a/tests/classification-config-validate-02/test.yaml +++ b/tests/classification-config-validate-02/test.yaml @@ -1,8 +1,10 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: min-version: 7 command: | - ${SRCDIR}/src/suricata -v --set classification-file="${TEST_DIR}/classification.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -r ${TEST_DIR}/input.pcap + ${SRCDIR}/src/suricata -v --set classification-file="${TEST_DIR}/classification.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -r ../detect-pcrexform-01/input.pcap checks: diff --git a/tests/cond-log-http-testmyids/input.pcap b/tests/cond-log-http-testmyids/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/cond-log-http-testmyids/input.pcap and /dev/null differ diff --git a/tests/cond-log-http-testmyids/test.yaml b/tests/cond-log-http-testmyids/test.yaml index 11f8f17be..d46468d90 100644 --- a/tests/cond-log-http-testmyids/test.yaml +++ b/tests/cond-log-http-testmyids/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/content-incomplete-hex-t-version-7-init-errors-fatal/empty.pcap b/tests/content-incomplete-hex-t-version-7-init-errors-fatal/empty.pcap deleted file mode 100644 index 4f9600e90..000000000 Binary files a/tests/content-incomplete-hex-t-version-7-init-errors-fatal/empty.pcap and /dev/null differ diff --git a/tests/content-incomplete-hex-t-version-7-init-errors-fatal/test.yaml b/tests/content-incomplete-hex-t-version-7-init-errors-fatal/test.yaml index 85764cb5a..8bd980fb3 100644 --- a/tests/content-incomplete-hex-t-version-7-init-errors-fatal/test.yaml +++ b/tests/content-incomplete-hex-t-version-7-init-errors-fatal/test.yaml @@ -1,3 +1,5 @@ +pcap: ../content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap + requires: min-version: 7 diff --git a/tests/datarep-02/input.pcap b/tests/datarep-02/input.pcap deleted file mode 100644 index d5171ffd0..000000000 Binary files a/tests/datarep-02/input.pcap and /dev/null differ diff --git a/tests/datarep-02/test.yaml b/tests/datarep-02/test.yaml index af62a2a6a..b21739c62 100644 --- a/tests/datarep-02/test.yaml +++ b/tests/datarep-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../datarep-01/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/datasets-01/input.pcap b/tests/datasets-01/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/datasets-01/input.pcap and /dev/null differ diff --git a/tests/datasets-01/test.yaml b/tests/datasets-01/test.yaml index 029c35a40..5aa403b0e 100644 --- a/tests/datasets-01/test.yaml +++ b/tests/datasets-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: files: - src/datasets.c diff --git a/tests/datasets-02-load/input.pcap b/tests/datasets-02-load/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/datasets-02-load/input.pcap and /dev/null differ diff --git a/tests/datasets-02-load/test.yaml b/tests/datasets-02-load/test.yaml index 29765d4f1..c2b82a142 100644 --- a/tests/datasets-02-load/test.yaml +++ b/tests/datasets-02-load/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/datasets-03-set/input.pcap b/tests/datasets-03-set/input.pcap deleted file mode 100644 index 790a6a155..000000000 Binary files a/tests/datasets-03-set/input.pcap and /dev/null differ diff --git a/tests/datasets-03-set/test.yaml b/tests/datasets-03-set/test.yaml index 851e03f38..ae3b1d47f 100644 --- a/tests/datasets-03-set/test.yaml +++ b/tests/datasets-03-set/test.yaml @@ -1,3 +1,5 @@ +pcap: ../datasets-05-state/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/datasets-07-state-ip/input.pcap b/tests/datasets-07-state-ip/input.pcap deleted file mode 100644 index 790a6a155..000000000 Binary files a/tests/datasets-07-state-ip/input.pcap and /dev/null differ diff --git a/tests/datasets-07-state-ip/test.yaml b/tests/datasets-07-state-ip/test.yaml index d368d010c..e5080999f 100644 --- a/tests/datasets-07-state-ip/test.yaml +++ b/tests/datasets-07-state-ip/test.yaml @@ -1,3 +1,5 @@ +pcap: ../datasets-05-state/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/datasets-09-load/input.pcap b/tests/datasets-09-load/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/datasets-09-load/input.pcap and /dev/null differ diff --git a/tests/datasets-09-load/test.yaml b/tests/datasets-09-load/test.yaml index d7084fe39..cc71d891f 100644 --- a/tests/datasets-09-load/test.yaml +++ b/tests/datasets-09-load/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/datasets-1m-StringSets/input.pcap b/tests/datasets-1m-StringSets/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/datasets-1m-StringSets/input.pcap and /dev/null differ diff --git a/tests/datasets-1m-StringSets/test.yaml b/tests/datasets-1m-StringSets/test.yaml index 29765d4f1..c2b82a142 100644 --- a/tests/datasets-1m-StringSets/test.yaml +++ b/tests/datasets-1m-StringSets/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/datasets-bug-5109/input.pcap b/tests/datasets-bug-5109/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/datasets-bug-5109/input.pcap and /dev/null differ diff --git a/tests/datasets-bug-5109/test.yaml b/tests/datasets-bug-5109/test.yaml index dc49ca5b1..7b08a1c33 100644 --- a/tests/datasets-bug-5109/test.yaml +++ b/tests/datasets-bug-5109/test.yaml @@ -1,10 +1,12 @@ +pcap: ../flowbit-oring/input.pcap + exit-code: 0 command: | ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/etc/classification.config" \ --set reference-config-file="${SRCDIR}/etc/reference.config" -l ${OUTPUT_DIR} \ --set threshold-file="${TEST_DIR}/threshold.config" \ - -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/test.rules + -c "${SRCDIR}/suricata.yaml" -r ../flowbit-oring/input.pcap -S ${TEST_DIR}/test.rules checks: - shell: diff --git a/tests/datasets-invalid-encoding/test.yaml b/tests/datasets-invalid-encoding/test.yaml index 1e6c05afa..c54bc420b 100644 --- a/tests/datasets-invalid-encoding/test.yaml +++ b/tests/datasets-invalid-encoding/test.yaml @@ -2,7 +2,7 @@ requires: files: - src/datasets.c -pcap: ../datasets-02-load/input.pcap +pcap: ../flowbit-oring/input.pcap args: - -k none diff --git a/tests/datasets/datasets-absolute-allowed/one-packet.pcap b/tests/datasets/datasets-absolute-allowed/one-packet.pcap deleted file mode 100644 index 00c2b34d0..000000000 Binary files a/tests/datasets/datasets-absolute-allowed/one-packet.pcap and /dev/null differ diff --git a/tests/datasets/datasets-absolute-allowed/test.yaml b/tests/datasets/datasets-absolute-allowed/test.yaml index 7df746ba8..990990721 100644 --- a/tests/datasets/datasets-absolute-allowed/test.yaml +++ b/tests/datasets/datasets-absolute-allowed/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../datasets/datasets-parent-path/one-packet.pcap + args: - -vvv diff --git a/tests/datasets/datasets-absolute-path/one-packet.pcap b/tests/datasets/datasets-absolute-path/one-packet.pcap deleted file mode 100644 index 00c2b34d0..000000000 Binary files a/tests/datasets/datasets-absolute-path/one-packet.pcap and /dev/null differ diff --git a/tests/datasets/datasets-absolute-path/test.yaml b/tests/datasets/datasets-absolute-path/test.yaml index 5caf69003..228b129d5 100644 --- a/tests/datasets/datasets-absolute-path/test.yaml +++ b/tests/datasets/datasets-absolute-path/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../datasets/datasets-parent-path/one-packet.pcap + exit-code: 1 checks: diff --git a/tests/datasets/datasets-deny-save/one-packet.pcap b/tests/datasets/datasets-deny-save/one-packet.pcap deleted file mode 100644 index 00c2b34d0..000000000 Binary files a/tests/datasets/datasets-deny-save/one-packet.pcap and /dev/null differ diff --git a/tests/datasets/datasets-deny-save/test.yaml b/tests/datasets/datasets-deny-save/test.yaml index 0bb9b1c1f..11fd0f694 100644 --- a/tests/datasets/datasets-deny-save/test.yaml +++ b/tests/datasets/datasets-deny-save/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../datasets/datasets-parent-path/one-packet.pcap + exit-code: 1 checks: diff --git a/tests/dcerpc-smb-fail/input.pcap b/tests/dcerpc-smb-fail/input.pcap deleted file mode 100644 index 9da7d7f86..000000000 Binary files a/tests/dcerpc-smb-fail/input.pcap and /dev/null differ diff --git a/tests/dcerpc-smb-fail/test.yaml b/tests/dcerpc-smb-fail/test.yaml index 005930835..e54ec17ed 100644 --- a/tests/dcerpc-smb-fail/test.yaml +++ b/tests/dcerpc-smb-fail/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5162/input.pcap + args: - -k none diff --git a/tests/dcerpc/dce-logging/input.pcap b/tests/dcerpc/dce-logging/input.pcap deleted file mode 100644 index d6d7cb50a..000000000 Binary files a/tests/dcerpc/dce-logging/input.pcap and /dev/null differ diff --git a/tests/dcerpc/dce-logging/test.yaml b/tests/dcerpc/dce-logging/test.yaml index a9fac6ada..342ad6ef8 100644 --- a/tests/dcerpc/dce-logging/test.yaml +++ b/tests/dcerpc/dce-logging/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../dcerpc/dcerpc-dce-iface-02/input.pcap + requires: min-version: 6.0.0 diff --git a/tests/dcerpc/dcerpc-dce-iface-03/input.pcap b/tests/dcerpc/dcerpc-dce-iface-03/input.pcap deleted file mode 100644 index d6d7cb50a..000000000 Binary files a/tests/dcerpc/dcerpc-dce-iface-03/input.pcap and /dev/null differ diff --git a/tests/dcerpc/dcerpc-dce-iface-03/test.yaml b/tests/dcerpc/dcerpc-dce-iface-03/test.yaml index 7c47e217d..87c6d23e4 100644 --- a/tests/dcerpc/dcerpc-dce-iface-03/test.yaml +++ b/tests/dcerpc/dcerpc-dce-iface-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../dcerpc/dcerpc-dce-iface-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dcerpc/dcerpc-dce-iface-04/input.pcap b/tests/dcerpc/dcerpc-dce-iface-04/input.pcap deleted file mode 100644 index d6d7cb50a..000000000 Binary files a/tests/dcerpc/dcerpc-dce-iface-04/input.pcap and /dev/null differ diff --git a/tests/dcerpc/dcerpc-dce-iface-04/test.yaml b/tests/dcerpc/dcerpc-dce-iface-04/test.yaml index 817f3763b..00dc98eaf 100644 --- a/tests/dcerpc/dcerpc-dce-iface-04/test.yaml +++ b/tests/dcerpc/dcerpc-dce-iface-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../dcerpc/dcerpc-dce-iface-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dcerpc/dcerpc-dce-opnum/input.pcap b/tests/dcerpc/dcerpc-dce-opnum/input.pcap deleted file mode 100644 index d6d7cb50a..000000000 Binary files a/tests/dcerpc/dcerpc-dce-opnum/input.pcap and /dev/null differ diff --git a/tests/dcerpc/dcerpc-dce-opnum/test.yaml b/tests/dcerpc/dcerpc-dce-opnum/test.yaml index 4516db108..e93f2d1e4 100644 --- a/tests/dcerpc/dcerpc-dce-opnum/test.yaml +++ b/tests/dcerpc/dcerpc-dce-opnum/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../dcerpc/dcerpc-dce-iface-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dcerpc/dcerpc-dce-stub-data/input.pcap b/tests/dcerpc/dcerpc-dce-stub-data/input.pcap deleted file mode 100644 index d6d7cb50a..000000000 Binary files a/tests/dcerpc/dcerpc-dce-stub-data/input.pcap and /dev/null differ diff --git a/tests/dcerpc/dcerpc-dce-stub-data/test.yaml b/tests/dcerpc/dcerpc-dce-stub-data/test.yaml index 92160925b..49882593b 100644 --- a/tests/dcerpc/dcerpc-dce-stub-data/test.yaml +++ b/tests/dcerpc/dcerpc-dce-stub-data/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../dcerpc/dcerpc-dce-iface-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dcerpc/dcerpc-dcepayload/input.pcap b/tests/dcerpc/dcerpc-dcepayload/input.pcap deleted file mode 100644 index d6d7cb50a..000000000 Binary files a/tests/dcerpc/dcerpc-dcepayload/input.pcap and /dev/null differ diff --git a/tests/dcerpc/dcerpc-dcepayload/test.yaml b/tests/dcerpc/dcerpc-dcepayload/test.yaml index 7ee3ea39a..686497d87 100644 --- a/tests/dcerpc/dcerpc-dcepayload/test.yaml +++ b/tests/dcerpc/dcerpc-dcepayload/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../dcerpc/dcerpc-dce-iface-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/decode-erspan-typeI-01/input.pcap b/tests/decode-erspan-typeI-01/input.pcap deleted file mode 100644 index 961075040..000000000 Binary files a/tests/decode-erspan-typeI-01/input.pcap and /dev/null differ diff --git a/tests/decode-erspan-typeI-01/test.yaml b/tests/decode-erspan-typeI-01/test.yaml index 034442bb1..bbbc790d4 100644 --- a/tests/decode-erspan-typeI-01/test.yaml +++ b/tests/decode-erspan-typeI-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../decode-erspan-typeI-02/input.pcap + requires: min-version: 6.0.0 diff --git a/tests/decode-erspan-typeI-03/input.pcap b/tests/decode-erspan-typeI-03/input.pcap deleted file mode 100644 index 961075040..000000000 Binary files a/tests/decode-erspan-typeI-03/input.pcap and /dev/null differ diff --git a/tests/decode-erspan-typeI-03/test.yaml b/tests/decode-erspan-typeI-03/test.yaml index cfed3ce78..17aee506c 100644 --- a/tests/decode-erspan-typeI-03/test.yaml +++ b/tests/decode-erspan-typeI-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../decode-erspan-typeI-02/input.pcap + requires: min-version: 5 diff --git a/tests/decode-vntag-01/input.pcap b/tests/decode-vntag-01/input.pcap deleted file mode 100644 index 64d4aca00..000000000 Binary files a/tests/decode-vntag-01/input.pcap and /dev/null differ diff --git a/tests/decode-vntag-01/test.yaml b/tests/decode-vntag-01/test.yaml index 199d4488f..627ec0d26 100644 --- a/tests/decode-vntag-01/test.yaml +++ b/tests/decode-vntag-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../decode-vntag-03/input.pcap + requires: min-version: 7 diff --git a/tests/decode-vntag-02/input.pcap b/tests/decode-vntag-02/input.pcap deleted file mode 100644 index 64d4aca00..000000000 Binary files a/tests/decode-vntag-02/input.pcap and /dev/null differ diff --git a/tests/decode-vntag-02/test.yaml b/tests/decode-vntag-02/test.yaml index 46e934264..6d464e56f 100644 --- a/tests/decode-vntag-02/test.yaml +++ b/tests/decode-vntag-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../decode-vntag-03/input.pcap + requires: min-version: 6.0.3 diff --git a/tests/detect-app-layer-protocol-01/input.pcap b/tests/detect-app-layer-protocol-01/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/detect-app-layer-protocol-01/input.pcap and /dev/null differ diff --git a/tests/detect-app-layer-protocol-01/test.yaml b/tests/detect-app-layer-protocol-01/test.yaml index ade805c54..6e5c2f2a9 100644 --- a/tests/detect-app-layer-protocol-01/test.yaml +++ b/tests/detect-app-layer-protocol-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + checks: - filter: count: 0 diff --git a/tests/detect-app-layer-protocol-02/input.pcap b/tests/detect-app-layer-protocol-02/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/detect-app-layer-protocol-02/input.pcap and /dev/null differ diff --git a/tests/detect-app-layer-protocol-02/test.yaml b/tests/detect-app-layer-protocol-02/test.yaml index 1d0eb860a..eef3a5086 100644 --- a/tests/detect-app-layer-protocol-02/test.yaml +++ b/tests/detect-app-layer-protocol-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: min-version: 7 diff --git a/tests/detect-bytemath-05/input.pcap b/tests/detect-bytemath-05/input.pcap deleted file mode 100644 index 4a18a072c..000000000 Binary files a/tests/detect-bytemath-05/input.pcap and /dev/null differ diff --git a/tests/detect-bytemath-05/test.yaml b/tests/detect-bytemath-05/test.yaml index f4edccea6..55fd0b830 100644 --- a/tests/detect-bytemath-05/test.yaml +++ b/tests/detect-bytemath-05/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-bytemath-01/input.pcap + requires: min-version: 7 diff --git a/tests/detect-bytemath-add-04/input.pcap b/tests/detect-bytemath-add-04/input.pcap deleted file mode 100644 index 4a18a072c..000000000 Binary files a/tests/detect-bytemath-add-04/input.pcap and /dev/null differ diff --git a/tests/detect-bytemath-add-04/test.yaml b/tests/detect-bytemath-add-04/test.yaml index d6b300c6e..0c63c4150 100644 --- a/tests/detect-bytemath-add-04/test.yaml +++ b/tests/detect-bytemath-add-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-bytemath-01/input.pcap + requires: files: - src/detect-bytemath.c diff --git a/tests/detect-bytemath-div-01/input.pcap b/tests/detect-bytemath-div-01/input.pcap deleted file mode 100644 index 4a18a072c..000000000 Binary files a/tests/detect-bytemath-div-01/input.pcap and /dev/null differ diff --git a/tests/detect-bytemath-div-01/test.yaml b/tests/detect-bytemath-div-01/test.yaml index 230df0c71..0f7114c2b 100644 --- a/tests/detect-bytemath-div-01/test.yaml +++ b/tests/detect-bytemath-div-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-bytemath-01/input.pcap + requires: files: - src/detect-bytemath.c diff --git a/tests/detect-bytemath-sub-03/input.pcap b/tests/detect-bytemath-sub-03/input.pcap deleted file mode 100644 index 4a18a072c..000000000 Binary files a/tests/detect-bytemath-sub-03/input.pcap and /dev/null differ diff --git a/tests/detect-bytemath-sub-03/test.yaml b/tests/detect-bytemath-sub-03/test.yaml index d6b300c6e..0c63c4150 100644 --- a/tests/detect-bytemath-sub-03/test.yaml +++ b/tests/detect-bytemath-sub-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-bytemath-01/input.pcap + requires: files: - src/detect-bytemath.c diff --git a/tests/detect-bytetest-01/input.pcap b/tests/detect-bytetest-01/input.pcap deleted file mode 100644 index 274449d64..000000000 Binary files a/tests/detect-bytetest-01/input.pcap and /dev/null differ diff --git a/tests/detect-bytetest-01/test.yaml b/tests/detect-bytetest-01/test.yaml index 15c83aecb..f5f66d6c8 100644 --- a/tests/detect-bytetest-01/test.yaml +++ b/tests/detect-bytetest-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../byte-extract-01/input.pcap + requires: min-version: 6.0 diff --git a/tests/detect-bytetest-04/input.pcap b/tests/detect-bytetest-04/input.pcap deleted file mode 100644 index 186aebd37..000000000 Binary files a/tests/detect-bytetest-04/input.pcap and /dev/null differ diff --git a/tests/detect-bytetest-04/test.yaml b/tests/detect-bytetest-04/test.yaml index fa54b92d0..1f917793f 100644 --- a/tests/detect-bytetest-04/test.yaml +++ b/tests/detect-bytetest-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-bytetest-03/input.pcap + requires: min-version: 7 diff --git a/tests/detect-bytetest-05/test.yaml b/tests/detect-bytetest-05/test.yaml index 7ae13854d..5ccca3c1c 100644 --- a/tests/detect-bytetest-05/test.yaml +++ b/tests/detect-bytetest-05/test.yaml @@ -4,7 +4,7 @@ requires: args: - --set stream.midstream=true -pcap: ../detect-bytetest-04/input.pcap +pcap: ../detect-bytetest-03/input.pcap checks: - shell: diff --git a/tests/detect-compress_whitespace-01/input.pcap b/tests/detect-compress_whitespace-01/input.pcap deleted file mode 100644 index cc069dc98..000000000 Binary files a/tests/detect-compress_whitespace-01/input.pcap and /dev/null differ diff --git a/tests/detect-compress_whitespace-01/test.yaml b/tests/detect-compress_whitespace-01/test.yaml index 3106bcd9d..d2424b3a9 100644 --- a/tests/detect-compress_whitespace-01/test.yaml +++ b/tests/detect-compress_whitespace-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-ips/input.pcap + requires: min-version: 6 pcap: false diff --git a/tests/detect-compress_whitespace-02/input.pcap b/tests/detect-compress_whitespace-02/input.pcap deleted file mode 100644 index cc069dc98..000000000 Binary files a/tests/detect-compress_whitespace-02/input.pcap and /dev/null differ diff --git a/tests/detect-compress_whitespace-02/test.yaml b/tests/detect-compress_whitespace-02/test.yaml index 808abea47..2bdaddfcf 100644 --- a/tests/detect-compress_whitespace-02/test.yaml +++ b/tests/detect-compress_whitespace-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-ips/input.pcap + requires: min-version: 6 diff --git a/tests/detect-content-ends-with-negated-03/input.pcap b/tests/detect-content-ends-with-negated-03/input.pcap deleted file mode 100644 index 9aa73ea00..000000000 Binary files a/tests/detect-content-ends-with-negated-03/input.pcap and /dev/null differ diff --git a/tests/detect-content-ends-with-negated-03/test.yaml b/tests/detect-content-ends-with-negated-03/test.yaml index ca9103ee2..55162d694 100644 --- a/tests/detect-content-ends-with-negated-03/test.yaml +++ b/tests/detect-content-ends-with-negated-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-content-ends-with-negated-01/input.pcap + requires: gt-version: 6.0.11 diff --git a/tests/detect-engine-proto/input.pcap b/tests/detect-engine-proto/input.pcap deleted file mode 100644 index 2893440fa..000000000 Binary files a/tests/detect-engine-proto/input.pcap and /dev/null differ diff --git a/tests/detect-engine-proto/test.yaml b/tests/detect-engine-proto/test.yaml index ba4d1584e..55d07fec2 100644 --- a/tests/detect-engine-proto/test.yaml +++ b/tests/detect-engine-proto/test.yaml @@ -1,3 +1,5 @@ +pcap: ../tcp-fastopen-01/tfo.pcap + args: - -k none diff --git a/tests/detect-filestore-config-03/3103.pcap b/tests/detect-filestore-config-03/3103.pcap deleted file mode 100644 index 78cc432c2..000000000 Binary files a/tests/detect-filestore-config-03/3103.pcap and /dev/null differ diff --git a/tests/detect-filestore-config-03/test.yaml b/tests/detect-filestore-config-03/test.yaml index f991f0efd..93f465d9a 100644 --- a/tests/detect-filestore-config-03/test.yaml +++ b/tests/detect-filestore-config-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-filestore-config-04/test.pcap + requires: min-version: 5.0.1 features: diff --git a/tests/detect-hostbits/detect-hostbits-01/input.pcap b/tests/detect-hostbits/detect-hostbits-01/input.pcap deleted file mode 100644 index 49593f3d9..000000000 Binary files a/tests/detect-hostbits/detect-hostbits-01/input.pcap and /dev/null differ diff --git a/tests/detect-hostbits/detect-hostbits-01/test.yaml b/tests/detect-hostbits/detect-hostbits-01/test.yaml index c4b433b0e..b11266359 100644 --- a/tests/detect-hostbits/detect-hostbits-01/test.yaml +++ b/tests/detect-hostbits/detect-hostbits-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../detect-flowbits/input.pcap + args: - -k none diff --git a/tests/detect-hostbits/detect-hostbits-02/input.pcap b/tests/detect-hostbits/detect-hostbits-02/input.pcap deleted file mode 100644 index 49593f3d9..000000000 Binary files a/tests/detect-hostbits/detect-hostbits-02/input.pcap and /dev/null differ diff --git a/tests/detect-hostbits/detect-hostbits-02/test.yaml b/tests/detect-hostbits/detect-hostbits-02/test.yaml index e908228b3..4950901ec 100644 --- a/tests/detect-hostbits/detect-hostbits-02/test.yaml +++ b/tests/detect-hostbits/detect-hostbits-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../detect-flowbits/input.pcap + args: - -k none diff --git a/tests/detect-hostbits/detect-hostbits-03/input.pcap b/tests/detect-hostbits/detect-hostbits-03/input.pcap deleted file mode 100644 index 49593f3d9..000000000 Binary files a/tests/detect-hostbits/detect-hostbits-03/input.pcap and /dev/null differ diff --git a/tests/detect-hostbits/detect-hostbits-03/test.yaml b/tests/detect-hostbits/detect-hostbits-03/test.yaml index dfcf30bc7..ae70bb82f 100644 --- a/tests/detect-hostbits/detect-hostbits-03/test.yaml +++ b/tests/detect-hostbits/detect-hostbits-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../detect-flowbits/input.pcap + args: - -k none diff --git a/tests/detect-itype/test.pcap b/tests/detect-itype/test.pcap deleted file mode 100644 index f84ec757b..000000000 Binary files a/tests/detect-itype/test.pcap and /dev/null differ diff --git a/tests/detect-itype/test.yaml b/tests/detect-itype/test.yaml index d9347e825..3748f961d 100644 --- a/tests/detect-itype/test.yaml +++ b/tests/detect-itype/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-itype-prefilter/icmpv4-ping.pcap + args: - -k none diff --git a/tests/detect-pcrexform-02/input.pcap b/tests/detect-pcrexform-02/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/detect-pcrexform-02/input.pcap and /dev/null differ diff --git a/tests/detect-pcrexform-02/test.yaml b/tests/detect-pcrexform-02/test.yaml index bedb646b0..eb7b57cf6 100644 --- a/tests/detect-pcrexform-02/test.yaml +++ b/tests/detect-pcrexform-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: files: diff --git a/tests/detect-pcrexform-03/input.pcap b/tests/detect-pcrexform-03/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/detect-pcrexform-03/input.pcap and /dev/null differ diff --git a/tests/detect-pcrexform-03/test.yaml b/tests/detect-pcrexform-03/test.yaml index ccd0813a4..274f4349b 100644 --- a/tests/detect-pcrexform-03/test.yaml +++ b/tests/detect-pcrexform-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: lt-version: 7 diff --git a/tests/detect-pcrexform-04/input.pcap b/tests/detect-pcrexform-04/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/detect-pcrexform-04/input.pcap and /dev/null differ diff --git a/tests/detect-pcrexform-04/test.yaml b/tests/detect-pcrexform-04/test.yaml index a8be268ee..47b100120 100644 --- a/tests/detect-pcrexform-04/test.yaml +++ b/tests/detect-pcrexform-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: files: diff --git a/tests/detect-pcrexform-05/input.pcap b/tests/detect-pcrexform-05/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/detect-pcrexform-05/input.pcap and /dev/null differ diff --git a/tests/detect-pcrexform-05/test.yaml b/tests/detect-pcrexform-05/test.yaml index 19e9801d6..ee0d94899 100644 --- a/tests/detect-pcrexform-05/test.yaml +++ b/tests/detect-pcrexform-05/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: files: diff --git a/tests/detect-pcrexform-06/input.pcap b/tests/detect-pcrexform-06/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/detect-pcrexform-06/input.pcap and /dev/null differ diff --git a/tests/detect-pcrexform-06/test.yaml b/tests/detect-pcrexform-06/test.yaml index 437afa285..413af6d39 100644 --- a/tests/detect-pcrexform-06/test.yaml +++ b/tests/detect-pcrexform-06/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: files: diff --git a/tests/detect-strip_whitespace-02/input.pcap b/tests/detect-strip_whitespace-02/input.pcap deleted file mode 100644 index cc069dc98..000000000 Binary files a/tests/detect-strip_whitespace-02/input.pcap and /dev/null differ diff --git a/tests/detect-strip_whitespace-02/test.yaml b/tests/detect-strip_whitespace-02/test.yaml index 808abea47..2bdaddfcf 100644 --- a/tests/detect-strip_whitespace-02/test.yaml +++ b/tests/detect-strip_whitespace-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-ips/input.pcap + requires: min-version: 6 diff --git a/tests/dhcp-eve-extended-pre-6/input.pcap b/tests/dhcp-eve-extended-pre-6/input.pcap deleted file mode 100644 index 93617129f..000000000 Binary files a/tests/dhcp-eve-extended-pre-6/input.pcap and /dev/null differ diff --git a/tests/dhcp-eve-extended-pre-6/test.yaml b/tests/dhcp-eve-extended-pre-6/test.yaml index b6f467cd1..0220ccba3 100644 --- a/tests/dhcp-eve-extended-pre-6/test.yaml +++ b/tests/dhcp-eve-extended-pre-6/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dhcp-eve-extended/input.pcap + requires: lt-version: 6.0.0 features: diff --git a/tests/dnp3-dnp3_data-alert/input.pcap b/tests/dnp3-dnp3_data-alert/input.pcap deleted file mode 100644 index 9c0d4885e..000000000 Binary files a/tests/dnp3-dnp3_data-alert/input.pcap and /dev/null differ diff --git a/tests/dnp3-dnp3_data-alert/test.yaml b/tests/dnp3-dnp3_data-alert/test.yaml index 8419f7ab0..7fe6f263f 100644 --- a/tests/dnp3-dnp3_data-alert/test.yaml +++ b/tests/dnp3-dnp3_data-alert/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dnp3-eve/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dnp3-dnp3_func-alert/input.pcap b/tests/dnp3-dnp3_func-alert/input.pcap deleted file mode 100644 index 9c0d4885e..000000000 Binary files a/tests/dnp3-dnp3_func-alert/input.pcap and /dev/null differ diff --git a/tests/dnp3-dnp3_func-alert/test.yaml b/tests/dnp3-dnp3_func-alert/test.yaml index 6d038fb31..b04d48493 100644 --- a/tests/dnp3-dnp3_func-alert/test.yaml +++ b/tests/dnp3-dnp3_func-alert/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dnp3-eve/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dnp3-dnp3_obj-alert/input.pcap b/tests/dnp3-dnp3_obj-alert/input.pcap deleted file mode 100644 index 9c0d4885e..000000000 Binary files a/tests/dnp3-dnp3_obj-alert/input.pcap and /dev/null differ diff --git a/tests/dnp3-dnp3_obj-alert/test.yaml b/tests/dnp3-dnp3_obj-alert/test.yaml index 00ccdefa1..bc1dab550 100644 --- a/tests/dnp3-dnp3_obj-alert/test.yaml +++ b/tests/dnp3-dnp3_obj-alert/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dnp3-eve/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-eve-v1/input.pcap b/tests/dns-eve-v1/input.pcap deleted file mode 100644 index 5c9ee35b3..000000000 Binary files a/tests/dns-eve-v1/input.pcap and /dev/null differ diff --git a/tests/dns-eve-v1/test.yaml b/tests/dns-eve-v1/test.yaml index 655b17fdb..c10472e1f 100644 --- a/tests/dns-eve-v1/test.yaml +++ b/tests/dns-eve-v1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-eve/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-json-log/input.pcap b/tests/dns-json-log/input.pcap deleted file mode 100644 index 5c9ee35b3..000000000 Binary files a/tests/dns-json-log/input.pcap and /dev/null differ diff --git a/tests/dns-json-log/test.yaml b/tests/dns-json-log/test.yaml index c3a0d030d..bfafe7446 100644 --- a/tests/dns-json-log/test.yaml +++ b/tests/dns-json-log/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-eve/input.pcap + requires: lt-version: 6 features: diff --git a/tests/dns-lua-rules/dig-a-www.suricata-ids.org.pcap b/tests/dns-lua-rules/dig-a-www.suricata-ids.org.pcap deleted file mode 100644 index 663a6797f..000000000 Binary files a/tests/dns-lua-rules/dig-a-www.suricata-ids.org.pcap and /dev/null differ diff --git a/tests/dns-lua-rules/test.yaml b/tests/dns-lua-rules/test.yaml index 298034b36..58f8d4e66 100644 --- a/tests/dns-lua-rules/test.yaml +++ b/tests/dns-lua-rules/test.yaml @@ -1,3 +1,5 @@ +pcap: ../cond-log-dns-dig/input.pcap + requires: features: - HAVE_LUA diff --git a/tests/dns-single-request/input.pcap b/tests/dns-single-request/input.pcap deleted file mode 100644 index 87682e7b4..000000000 Binary files a/tests/dns-single-request/input.pcap and /dev/null differ diff --git a/tests/dns-single-request/test.yaml b/tests/dns-single-request/test.yaml index 6e799f63b..a3a2cde7f 100644 --- a/tests/dns-single-request/test.yaml +++ b/tests/dns-single-request/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-single-request-v1/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-tcp-multirequest-buffer-v1/dns-tcp-multirequest-buffer.pcap b/tests/dns-tcp-multirequest-buffer-v1/dns-tcp-multirequest-buffer.pcap deleted file mode 100644 index f46aefbf6..000000000 Binary files a/tests/dns-tcp-multirequest-buffer-v1/dns-tcp-multirequest-buffer.pcap and /dev/null differ diff --git a/tests/dns-tcp-multirequest-buffer-v1/test.yaml b/tests/dns-tcp-multirequest-buffer-v1/test.yaml index 015e39ffe..637d013e4 100644 --- a/tests/dns-tcp-multirequest-buffer-v1/test.yaml +++ b/tests/dns-tcp-multirequest-buffer-v1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-tcp-www-google-com/dns.pcap b/tests/dns-tcp-www-google-com/dns.pcap deleted file mode 100644 index 55378094c..000000000 Binary files a/tests/dns-tcp-www-google-com/dns.pcap and /dev/null differ diff --git a/tests/dns-tcp-www-google-com/test.yaml b/tests/dns-tcp-www-google-com/test.yaml index 16f4a6432..9dbe5d5bd 100644 --- a/tests/dns-tcp-www-google-com/test.yaml +++ b/tests/dns-tcp-www-google-com/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-tcp-www-google-com-v1/dns.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-double-request-response/dns-udp-double-request-response.pcap b/tests/dns-udp-double-request-response/dns-udp-double-request-response.pcap deleted file mode 100644 index 43b47e68c..000000000 Binary files a/tests/dns-udp-double-request-response/dns-udp-double-request-response.pcap and /dev/null differ diff --git a/tests/dns-udp-double-request-response/test.yaml b/tests/dns-udp-double-request-response/test.yaml index bd8327966..5df0f6337 100644 --- a/tests/dns-udp-double-request-response/test.yaml +++ b/tests/dns-udp-double-request-response/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-aaaa-only-v1/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-aaaa-only-v1/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-aaaa-only-v1/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-aaaa-only-v1/test.yaml b/tests/dns-udp-eve-log-aaaa-only-v1/test.yaml index cc69e0fc9..8025c29e5 100644 --- a/tests/dns-udp-eve-log-aaaa-only-v1/test.yaml +++ b/tests/dns-udp-eve-log-aaaa-only-v1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-aaaa-only/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-aaaa-only/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-aaaa-only/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-aaaa-only/test.yaml b/tests/dns-udp-eve-log-aaaa-only/test.yaml index f05f8e35c..c20ca3273 100644 --- a/tests/dns-udp-eve-log-aaaa-only/test.yaml +++ b/tests/dns-udp-eve-log-aaaa-only/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-answer-only-v1/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-answer-only-v1/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-answer-only-v1/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-answer-only-v1/test.yaml b/tests/dns-udp-eve-log-answer-only-v1/test.yaml index 117d87e21..27a1252a6 100644 --- a/tests/dns-udp-eve-log-answer-only-v1/test.yaml +++ b/tests/dns-udp-eve-log-answer-only-v1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-answer-only/test.yaml b/tests/dns-udp-eve-log-answer-only/test.yaml index 9d5319d27..f2cab03aa 100644 --- a/tests/dns-udp-eve-log-answer-only/test.yaml +++ b/tests/dns-udp-eve-log-answer-only/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-mx-only-v1/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-mx-only-v1/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-mx-only-v1/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-mx-only-v1/test.yaml b/tests/dns-udp-eve-log-mx-only-v1/test.yaml index 9af7359a6..da4d5f221 100644 --- a/tests/dns-udp-eve-log-mx-only-v1/test.yaml +++ b/tests/dns-udp-eve-log-mx-only-v1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-mx-only/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-mx-only/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-mx-only/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-mx-only/test.yaml b/tests/dns-udp-eve-log-mx-only/test.yaml index 6bbfff9ce..59f7ddb6d 100644 --- a/tests/dns-udp-eve-log-mx-only/test.yaml +++ b/tests/dns-udp-eve-log-mx-only/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-log-query-only/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns-udp-eve-log-query-only/dns-udp-google.com-a-aaaa-mx.pcap deleted file mode 100644 index def918f21..000000000 Binary files a/tests/dns-udp-eve-log-query-only/dns-udp-google.com-a-aaaa-mx.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-log-query-only/test.yaml b/tests/dns-udp-eve-log-query-only/test.yaml index a80f8d75b..7d00d3610 100644 --- a/tests/dns-udp-eve-log-query-only/test.yaml +++ b/tests/dns-udp-eve-log-query-only/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-eve-v1-dig/test.yaml b/tests/dns-udp-eve-v1-dig/test.yaml index 2e8c1e185..ad82b6e84 100644 --- a/tests/dns-udp-eve-v1-dig/test.yaml +++ b/tests/dns-udp-eve-v1-dig/test.yaml @@ -1,7 +1,7 @@ requires: lt-version: 7 -pcap: ../dns-udp-eve-v2-dig/input.pcap +pcap: ../cond-log-dns-dig//input.pcap checks: - filter: diff --git a/tests/dns-udp-eve-v2-dig/input.pcap b/tests/dns-udp-eve-v2-dig/input.pcap deleted file mode 100644 index 663a6797f..000000000 Binary files a/tests/dns-udp-eve-v2-dig/input.pcap and /dev/null differ diff --git a/tests/dns-udp-eve-v2-dig/test.yaml b/tests/dns-udp-eve-v2-dig/test.yaml index 00361e4b2..5f6dc7213 100644 --- a/tests/dns-udp-eve-v2-dig/test.yaml +++ b/tests/dns-udp-eve-v2-dig/test.yaml @@ -1,3 +1,5 @@ +pcap: ../cond-log-dns-dig/input.pcap + checks: - filter: count: 2 diff --git a/tests/dns-udp-nxdomain-soa-v1/dns-udp-nxdomain-soa.pcap b/tests/dns-udp-nxdomain-soa-v1/dns-udp-nxdomain-soa.pcap deleted file mode 100644 index eb47badda..000000000 Binary files a/tests/dns-udp-nxdomain-soa-v1/dns-udp-nxdomain-soa.pcap and /dev/null differ diff --git a/tests/dns-udp-nxdomain-soa-v1/test.yaml b/tests/dns-udp-nxdomain-soa-v1/test.yaml index 8e8bee430..96cadc0bd 100644 --- a/tests/dns-udp-nxdomain-soa-v1/test.yaml +++ b/tests/dns-udp-nxdomain-soa-v1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-eve-v2-udp-nxdomain-soa/dns-udp-nxdomain-soa.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-nxdomain-soa/dns-udp-nxdomain-soa.pcap b/tests/dns-udp-nxdomain-soa/dns-udp-nxdomain-soa.pcap deleted file mode 100644 index eb47badda..000000000 Binary files a/tests/dns-udp-nxdomain-soa/dns-udp-nxdomain-soa.pcap and /dev/null differ diff --git a/tests/dns-udp-nxdomain-soa/test.yaml b/tests/dns-udp-nxdomain-soa/test.yaml index c5c46a86e..58e30db35 100644 --- a/tests/dns-udp-nxdomain-soa/test.yaml +++ b/tests/dns-udp-nxdomain-soa/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-eve-v2-udp-nxdomain-soa/dns-udp-nxdomain-soa.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/dns-udp-unsolicited-response/dns-response-2x.pcap b/tests/dns-udp-unsolicited-response/dns-response-2x.pcap deleted file mode 100644 index bad14f669..000000000 Binary files a/tests/dns-udp-unsolicited-response/dns-response-2x.pcap and /dev/null differ diff --git a/tests/dns-udp-unsolicited-response/test.yaml b/tests/dns-udp-unsolicited-response/test.yaml index b19fa65e7..0c6222324 100644 --- a/tests/dns-udp-unsolicited-response/test.yaml +++ b/tests/dns-udp-unsolicited-response/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dns-udp-unsolicited-response-v1/dns-response-2x.pcap + checks: - filter: count: 1 diff --git a/tests/droped-flow-applayer-event-logged-dcerpc/input.pcap b/tests/droped-flow-applayer-event-logged-dcerpc/input.pcap deleted file mode 100644 index 014c3dc29..000000000 Binary files a/tests/droped-flow-applayer-event-logged-dcerpc/input.pcap and /dev/null differ diff --git a/tests/droped-flow-applayer-event-logged-dcerpc/test.yaml b/tests/droped-flow-applayer-event-logged-dcerpc/test.yaml index a65ab9b13..ee4fb722d 100644 --- a/tests/droped-flow-applayer-event-logged-dcerpc/test.yaml +++ b/tests/droped-flow-applayer-event-logged-dcerpc/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dcerpc/dcerpc-3109/input.pcap + args: - --simulate-ips - --set stream.midstream=true diff --git a/tests/droped-flow-applayer-event-logged-http/input-http-ACK.pcap b/tests/droped-flow-applayer-event-logged-http/input-http-ACK.pcap deleted file mode 100644 index c5b1c5155..000000000 Binary files a/tests/droped-flow-applayer-event-logged-http/input-http-ACK.pcap and /dev/null differ diff --git a/tests/droped-flow-applayer-event-logged-http/test.yaml b/tests/droped-flow-applayer-event-logged-http/test.yaml index 3c5faea4c..90e6e2388 100644 --- a/tests/droped-flow-applayer-event-logged-http/test.yaml +++ b/tests/droped-flow-applayer-event-logged-http/test.yaml @@ -1,3 +1,5 @@ +pcap: ../exception-policy-midstream-06/input-http-ACK.pcap + args: - --simulate-ips - --set stream.midstream=true diff --git a/tests/droped-flow-applayer-event-logged-smb/input.pcap b/tests/droped-flow-applayer-event-logged-smb/input.pcap deleted file mode 100644 index 0adc7740e..000000000 Binary files a/tests/droped-flow-applayer-event-logged-smb/input.pcap and /dev/null differ diff --git a/tests/droped-flow-applayer-event-logged-smb/test.yaml b/tests/droped-flow-applayer-event-logged-smb/test.yaml index 53d197869..c5df8a280 100644 --- a/tests/droped-flow-applayer-event-logged-smb/test.yaml +++ b/tests/droped-flow-applayer-event-logged-smb/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb3-01/input.pcap + args: - --simulate-ips - --set stream.midstream=true diff --git a/tests/eve-alert-metadata-defaults/test.yaml b/tests/eve-alert-metadata-defaults/test.yaml index be9aebb5b..00814bda9 100644 --- a/tests/eve-alert-metadata-defaults/test.yaml +++ b/tests/eve-alert-metadata-defaults/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata/testmyids.pcap + requires: script: diff --git a/tests/eve-alert-metadata-defaults/testmyids.pcap b/tests/eve-alert-metadata-defaults/testmyids.pcap deleted file mode 100644 index 868c57e59..000000000 Binary files a/tests/eve-alert-metadata-defaults/testmyids.pcap and /dev/null differ diff --git a/tests/eve-alert-metadata-enable-rule/test.yaml b/tests/eve-alert-metadata-enable-rule/test.yaml index 42bd1a0a3..0dd34722b 100644 --- a/tests/eve-alert-metadata-enable-rule/test.yaml +++ b/tests/eve-alert-metadata-enable-rule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata/testmyids.pcap + requires: script: diff --git a/tests/eve-alert-metadata-enable-rule/testmyids.pcap b/tests/eve-alert-metadata-enable-rule/testmyids.pcap deleted file mode 100644 index 868c57e59..000000000 Binary files a/tests/eve-alert-metadata-enable-rule/testmyids.pcap and /dev/null differ diff --git a/tests/eve-alert-metadata-off/test.yaml b/tests/eve-alert-metadata-off/test.yaml index c1bdf6273..72676ece4 100644 --- a/tests/eve-alert-metadata-off/test.yaml +++ b/tests/eve-alert-metadata-off/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata/testmyids.pcap + requires: script: diff --git a/tests/eve-alert-metadata-off/testmyids.pcap b/tests/eve-alert-metadata-off/testmyids.pcap deleted file mode 100644 index 868c57e59..000000000 Binary files a/tests/eve-alert-metadata-off/testmyids.pcap and /dev/null differ diff --git a/tests/eve-alert-verbose/test.yaml b/tests/eve-alert-verbose/test.yaml index b7baee94b..a0aadf097 100644 --- a/tests/eve-alert-verbose/test.yaml +++ b/tests/eve-alert-verbose/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata/testmyids.pcap + requires: script: diff --git a/tests/eve-alert-verbose/testmyids.pcap b/tests/eve-alert-verbose/testmyids.pcap deleted file mode 100644 index 868c57e59..000000000 Binary files a/tests/eve-alert-verbose/testmyids.pcap and /dev/null differ diff --git a/tests/eve-metadata-02-pass/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap b/tests/eve-metadata-02-pass/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap deleted file mode 100644 index 33e84169d..000000000 Binary files a/tests/eve-metadata-02-pass/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap and /dev/null differ diff --git a/tests/eve-metadata-02-pass/test.yaml b/tests/eve-metadata-02-pass/test.yaml index d6b72fa37..958314224 100644 --- a/tests/eve-metadata-02-pass/test.yaml +++ b/tests/eve-metadata-02-pass/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata-01-alert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/eve-metadata-03-noalert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap b/tests/eve-metadata-03-noalert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap deleted file mode 100644 index 33e84169d..000000000 Binary files a/tests/eve-metadata-03-noalert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap and /dev/null differ diff --git a/tests/eve-metadata-03-noalert/test.yaml b/tests/eve-metadata-03-noalert/test.yaml index d6b72fa37..958314224 100644 --- a/tests/eve-metadata-03-noalert/test.yaml +++ b/tests/eve-metadata-03-noalert/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata-01-alert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/eve-metadata-04-flowvar/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap b/tests/eve-metadata-04-flowvar/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap deleted file mode 100644 index 33e84169d..000000000 Binary files a/tests/eve-metadata-04-flowvar/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap and /dev/null differ diff --git a/tests/eve-metadata-04-flowvar/test.yaml b/tests/eve-metadata-04-flowvar/test.yaml index 4a818e4c2..1cf2da937 100644 --- a/tests/eve-metadata-04-flowvar/test.yaml +++ b/tests/eve-metadata-04-flowvar/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata-01-alert/80000000-037-PTP_Example_IPv4_HTTP_Session-PUBLIC-tp-01-TEST1.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/eve-tag-01/test.yaml b/tests/eve-tag-01/test.yaml index 53aad32cf..bc373b525 100644 --- a/tests/eve-tag-01/test.yaml +++ b/tests/eve-tag-01/test.yaml @@ -2,7 +2,7 @@ args: - --runmode=single - -k none -pcap: ../smtp-file-data-02/input.pcap +pcap: ../bug-3616-smtp/input.pcap checks: - filter: diff --git a/tests/exception-policy-applayer-01/test.yaml b/tests/exception-policy-applayer-01/test.yaml index 9991bf4c6..1a210454e 100644 --- a/tests/exception-policy-applayer-01/test.yaml +++ b/tests/exception-policy-applayer-01/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-default-01/test.yaml b/tests/exception-policy-default-01/test.yaml index fdb279851..c3821598c 100644 --- a/tests/exception-policy-default-01/test.yaml +++ b/tests/exception-policy-default-01/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-default-02/test.yaml b/tests/exception-policy-default-02/test.yaml index 64fc4c670..0276ca638 100644 --- a/tests/exception-policy-default-02/test.yaml +++ b/tests/exception-policy-default-02/test.yaml @@ -1,4 +1,4 @@ -pcap: ../exception-policy-midstream-03/input.pcap +pcap: ../alert-testmyids-midstream5/input.pcap args: - --set stream.midstream=true diff --git a/tests/exception-policy-default-03/input.pcap b/tests/exception-policy-default-03/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-default-03/input.pcap and /dev/null differ diff --git a/tests/exception-policy-default-03/test.yaml b/tests/exception-policy-default-03/test.yaml index e25b741a7..61a8ade3e 100644 --- a/tests/exception-policy-default-03/test.yaml +++ b/tests/exception-policy-default-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../alert-testmyids-midstream5/input.pcap + args: - --simulate-ips - --set exception-policy=auto diff --git a/tests/exception-policy-default-04/input.pcap b/tests/exception-policy-default-04/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-default-04/input.pcap and /dev/null differ diff --git a/tests/exception-policy-default-04/test.yaml b/tests/exception-policy-default-04/test.yaml index cff7eab3e..d6785afc9 100644 --- a/tests/exception-policy-default-04/test.yaml +++ b/tests/exception-policy-default-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../alert-testmyids-midstream5/input.pcap + checks: - filter: count: 1 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-01/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-01/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-01/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml index 1d4f2b8a6..7adfc8048 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-02/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-02/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-02/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml index dd2a2d565..3cbb4658a 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-03/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-03/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-03/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml index efcc37494..562c31d4a 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-04/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-04/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-04/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml index ef36588fd..e1c3d501e 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-05/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-05/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-05/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml index 54c74b354..e61f73090 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-05/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-06/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-06/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-06/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml index e861245cd..c08352b49 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-06/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-07/input.pcap b/tests/exception-policy-master-switch/exception-policy-master-switch-07/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-master-switch/exception-policy-master-switch-07/input.pcap and /dev/null differ diff --git a/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml b/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml index e861245cd..c08352b49 100644 --- a/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml +++ b/tests/exception-policy-master-switch/exception-policy-master-switch-07/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../alert-testmyids-midstream5/input.pcap + requires: min-version: 7 diff --git a/tests/exception-policy-midstream-01/input.pcap b/tests/exception-policy-midstream-01/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-midstream-01/input.pcap and /dev/null differ diff --git a/tests/exception-policy-midstream-01/test.yaml b/tests/exception-policy-midstream-01/test.yaml index 77d4e07f8..8cf3deb07 100644 --- a/tests/exception-policy-midstream-01/test.yaml +++ b/tests/exception-policy-midstream-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../alert-testmyids-midstream5/input.pcap + args: - --simulate-ips - --set stream.midstream-policy=pass-flow diff --git a/tests/exception-policy-midstream-02/input.pcap b/tests/exception-policy-midstream-02/input.pcap deleted file mode 100644 index 154af0820..000000000 Binary files a/tests/exception-policy-midstream-02/input.pcap and /dev/null differ diff --git a/tests/exception-policy-midstream-02/test.yaml b/tests/exception-policy-midstream-02/test.yaml index 46e4d1fc6..79fe323b3 100644 --- a/tests/exception-policy-midstream-02/test.yaml +++ b/tests/exception-policy-midstream-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../tcp-async-01/input.pcap + args: - --simulate-ips - --set stream.async-oneside=true diff --git a/tests/exception-policy-midstream-03/input.pcap b/tests/exception-policy-midstream-03/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-midstream-03/input.pcap and /dev/null differ diff --git a/tests/exception-policy-midstream-03/test.yaml b/tests/exception-policy-midstream-03/test.yaml index f5a096317..04233a600 100644 --- a/tests/exception-policy-midstream-03/test.yaml +++ b/tests/exception-policy-midstream-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../alert-testmyids-midstream5/input.pcap + args: - --simulate-ips - --set stream.midstream=true diff --git a/tests/exception-policy-midstream-04/input.pcap b/tests/exception-policy-midstream-04/input.pcap deleted file mode 100644 index c5b1c5155..000000000 Binary files a/tests/exception-policy-midstream-04/input.pcap and /dev/null differ diff --git a/tests/exception-policy-midstream-04/test.yaml b/tests/exception-policy-midstream-04/test.yaml index e58e756aa..b57a41465 100644 --- a/tests/exception-policy-midstream-04/test.yaml +++ b/tests/exception-policy-midstream-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../exception-policy-midstream-06/input-http-ACK.pcap + args: - --simulate-ips - --set stream.midstream-policy=pass-flow diff --git a/tests/exception-policy-midstream-05/input.pcap b/tests/exception-policy-midstream-05/input.pcap deleted file mode 100644 index 7a89ef172..000000000 Binary files a/tests/exception-policy-midstream-05/input.pcap and /dev/null differ diff --git a/tests/exception-policy-midstream-05/test.yaml b/tests/exception-policy-midstream-05/test.yaml index 3edf00e2e..bd54da62c 100644 --- a/tests/exception-policy-midstream-05/test.yaml +++ b/tests/exception-policy-midstream-05/test.yaml @@ -1,3 +1,5 @@ +pcap: ../alert-testmyids-midstream5/input.pcap + args: - --simulate-ips - --set stream.midstream-policy=bypass diff --git a/tests/exception-policy-midstream-07/input.pcap b/tests/exception-policy-midstream-07/input.pcap deleted file mode 100644 index 0adc7740e..000000000 Binary files a/tests/exception-policy-midstream-07/input.pcap and /dev/null differ diff --git a/tests/exception-policy-midstream-07/test.yaml b/tests/exception-policy-midstream-07/test.yaml index 73e9d6671..37430914a 100644 --- a/tests/exception-policy-midstream-07/test.yaml +++ b/tests/exception-policy-midstream-07/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb3-01/input.pcap + args: - --simulate-ips - --set stream.midstream-policy=bypass diff --git a/tests/exception-policy-reject-action-01/input-http-ACK.pcap b/tests/exception-policy-reject-action-01/input-http-ACK.pcap deleted file mode 100644 index c5b1c5155..000000000 Binary files a/tests/exception-policy-reject-action-01/input-http-ACK.pcap and /dev/null differ diff --git a/tests/exception-policy-reject-action-01/test.yaml b/tests/exception-policy-reject-action-01/test.yaml index c4d32d5fd..4bea809b6 100644 --- a/tests/exception-policy-reject-action-01/test.yaml +++ b/tests/exception-policy-reject-action-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../exception-policy-midstream-06/input-http-ACK.pcap + args: - --simulate-ips - --set stream.midstream-policy=reject diff --git a/tests/exception-policy-stream-reassembly-memcap-01/test.yaml b/tests/exception-policy-stream-reassembly-memcap-01/test.yaml index 6a4fac482..87a595d45 100644 --- a/tests/exception-policy-stream-reassembly-memcap-01/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-01/test.yaml @@ -4,7 +4,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-02/test.yaml b/tests/exception-policy-stream-reassembly-memcap-02/test.yaml index 49eb393aa..9913af907 100644 --- a/tests/exception-policy-stream-reassembly-memcap-02/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-02/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-03/test.yaml b/tests/exception-policy-stream-reassembly-memcap-03/test.yaml index 04168bbf7..45e1d4d7e 100644 --- a/tests/exception-policy-stream-reassembly-memcap-03/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-03/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-04/test.yaml b/tests/exception-policy-stream-reassembly-memcap-04/test.yaml index 6a4fac482..87a595d45 100644 --- a/tests/exception-policy-stream-reassembly-memcap-04/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-04/test.yaml @@ -4,7 +4,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-05/test.yaml b/tests/exception-policy-stream-reassembly-memcap-05/test.yaml index 6e7d457bc..d8d8e00ff 100644 --- a/tests/exception-policy-stream-reassembly-memcap-05/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-05/test.yaml @@ -4,7 +4,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-06/test.yaml b/tests/exception-policy-stream-reassembly-memcap-06/test.yaml index 05406a18a..d5c95b8b4 100644 --- a/tests/exception-policy-stream-reassembly-memcap-06/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-06/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-07/test.yaml b/tests/exception-policy-stream-reassembly-memcap-07/test.yaml index 464e812ea..d0a25ad07 100644 --- a/tests/exception-policy-stream-reassembly-memcap-07/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-07/test.yaml @@ -4,7 +4,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-08/test.yaml b/tests/exception-policy-stream-reassembly-memcap-08/test.yaml index 464e812ea..d0a25ad07 100644 --- a/tests/exception-policy-stream-reassembly-memcap-08/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-08/test.yaml @@ -4,7 +4,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-reassembly-memcap-09/test.yaml b/tests/exception-policy-stream-reassembly-memcap-09/test.yaml index 8e5057b08..f76f4cb5b 100644 --- a/tests/exception-policy-stream-reassembly-memcap-09/test.yaml +++ b/tests/exception-policy-stream-reassembly-memcap-09/test.yaml @@ -4,7 +4,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/exception-policy-stream-ssn-memcap-01/test.yaml b/tests/exception-policy-stream-ssn-memcap-01/test.yaml index 5fde4c8e9..830934f48 100644 --- a/tests/exception-policy-stream-ssn-memcap-01/test.yaml +++ b/tests/exception-policy-stream-ssn-memcap-01/test.yaml @@ -3,7 +3,7 @@ requires: - DEBUG files: - src/util-exception-policy.c -pcap: ../tls/tls-ja3s/input.pcap +pcap: ../tls/tls-certs-alert/input.pcap args: - --simulate-ips - -k none diff --git a/tests/filesize-keyword/input.pcap b/tests/filesize-keyword/input.pcap deleted file mode 100644 index e97b433c4..000000000 Binary files a/tests/filesize-keyword/input.pcap and /dev/null differ diff --git a/tests/filesize-keyword/test.yaml b/tests/filesize-keyword/test.yaml index ce6258fc7..47b60ead9 100644 --- a/tests/filesize-keyword/test.yaml +++ b/tests/filesize-keyword/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb-eicar-file/input.pcap + # disables checksum verification args: - -k none diff --git a/tests/flow-drop-iponly-01/test-limit.pcap b/tests/flow-drop-iponly-01/test-limit.pcap deleted file mode 100644 index 60fa36e76..000000000 Binary files a/tests/flow-drop-iponly-01/test-limit.pcap and /dev/null differ diff --git a/tests/flow-drop-iponly-01/test.yaml b/tests/flow-drop-iponly-01/test.yaml index 0679309c3..68eb9a452 100644 --- a/tests/flow-drop-iponly-01/test.yaml +++ b/tests/flow-drop-iponly-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-5066-iponly-cidr-ordering-01/test-limit.pcap + requirements: min-version: 6 diff --git a/tests/flowbit-bad-rules-6-01/empty.pcap b/tests/flowbit-bad-rules-6-01/empty.pcap deleted file mode 100644 index 4f9600e90..000000000 Binary files a/tests/flowbit-bad-rules-6-01/empty.pcap and /dev/null differ diff --git a/tests/flowbit-bad-rules-6-01/test.yaml b/tests/flowbit-bad-rules-6-01/test.yaml index 512cd24ac..248e9c1a0 100644 --- a/tests/flowbit-bad-rules-6-01/test.yaml +++ b/tests/flowbit-bad-rules-6-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap + requires: lt-version: 7 diff --git a/tests/flowbit-bad-rules-6-02/empty.pcap b/tests/flowbit-bad-rules-6-02/empty.pcap deleted file mode 100644 index 4f9600e90..000000000 Binary files a/tests/flowbit-bad-rules-6-02/empty.pcap and /dev/null differ diff --git a/tests/flowbit-bad-rules-6-02/test.yaml b/tests/flowbit-bad-rules-6-02/test.yaml index 767e19315..53643c256 100644 --- a/tests/flowbit-bad-rules-6-02/test.yaml +++ b/tests/flowbit-bad-rules-6-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap + requires: lt-version: 7 diff --git a/tests/flowbit-bad-rules-6-03/empty.pcap b/tests/flowbit-bad-rules-6-03/empty.pcap deleted file mode 100644 index 4f9600e90..000000000 Binary files a/tests/flowbit-bad-rules-6-03/empty.pcap and /dev/null differ diff --git a/tests/flowbit-bad-rules-6-03/test.yaml b/tests/flowbit-bad-rules-6-03/test.yaml index 9805a7b8a..8cf110a3a 100644 --- a/tests/flowbit-bad-rules-6-03/test.yaml +++ b/tests/flowbit-bad-rules-6-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap + requires: lt-version: 7 diff --git a/tests/geoip/test.yaml b/tests/geoip/test.yaml index 97d7e535e..300516075 100644 --- a/tests/geoip/test.yaml +++ b/tests/geoip/test.yaml @@ -3,7 +3,7 @@ requires: - HAVE_LIBJANSSON - GeoIP2 -pcap: ../alert-testmyids/input.pcap +pcap: ../flowbit-oring/input.pcap checks: diff --git a/tests/http-double-encoded-uri/input.pcap b/tests/http-double-encoded-uri/input.pcap deleted file mode 100644 index 171cfc524..000000000 Binary files a/tests/http-double-encoded-uri/input.pcap and /dev/null differ diff --git a/tests/http-double-encoded-uri/test.yaml b/tests/http-double-encoded-uri/test.yaml index 2fadf930d..43d92874f 100644 --- a/tests/http-double-encoded-uri/test.yaml +++ b/tests/http-double-encoded-uri/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-urldecode/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http-gap-simple-frames-ips/input.pcap b/tests/http-gap-simple-frames-ips/input.pcap deleted file mode 100644 index 5edd0f198..000000000 Binary files a/tests/http-gap-simple-frames-ips/input.pcap and /dev/null differ diff --git a/tests/http-gap-simple-frames-ips/test.yaml b/tests/http-gap-simple-frames-ips/test.yaml index 34bc09c28..c7e3a3b4e 100644 --- a/tests/http-gap-simple-frames-ips/test.yaml +++ b/tests/http-gap-simple-frames-ips/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http-gap-simple/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http-gap-simple-frames/input.pcap b/tests/http-gap-simple-frames/input.pcap deleted file mode 100644 index 5edd0f198..000000000 Binary files a/tests/http-gap-simple-frames/input.pcap and /dev/null differ diff --git a/tests/http-gap-simple-frames/test.yaml b/tests/http-gap-simple-frames/test.yaml index c13ac1340..63b20f876 100644 --- a/tests/http-gap-simple-frames/test.yaml +++ b/tests/http-gap-simple-frames/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http-gap-simple/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http-range/input.pcap b/tests/http-range/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/http-range/input.pcap and /dev/null differ diff --git a/tests/http-range/test.yaml b/tests/http-range/test.yaml index 04618b5da..7b178145d 100644 --- a/tests/http-range/test.yaml +++ b/tests/http-range/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-pcrexform-01/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http-sha256-drop/input.pcap b/tests/http-sha256-drop/input.pcap deleted file mode 100644 index 20a739378..000000000 Binary files a/tests/http-sha256-drop/input.pcap and /dev/null differ diff --git a/tests/http-sha256-drop/test.yaml b/tests/http-sha256-drop/test.yaml index d450431ba..ea41b30c7 100644 --- a/tests/http-sha256-drop/test.yaml +++ b/tests/http-sha256-drop/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-4663/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http-xff-eve-forward-extra-data/test.pcap b/tests/http-xff-eve-forward-extra-data/test.pcap deleted file mode 100644 index 29f087e38..000000000 Binary files a/tests/http-xff-eve-forward-extra-data/test.pcap and /dev/null differ diff --git a/tests/http-xff-eve-forward-extra-data/test.yaml b/tests/http-xff-eve-forward-extra-data/test.yaml index 30d9f5f6a..748bf58e7 100644 --- a/tests/http-xff-eve-forward-extra-data/test.yaml +++ b/tests/http-xff-eve-forward-extra-data/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http-xff-eve-reverse-overwrite/test.pcap + args: - -k none diff --git a/tests/http-xff-eve-forward-overwrite/test.pcap b/tests/http-xff-eve-forward-overwrite/test.pcap deleted file mode 100644 index 29f087e38..000000000 Binary files a/tests/http-xff-eve-forward-overwrite/test.pcap and /dev/null differ diff --git a/tests/http-xff-eve-forward-overwrite/test.yaml b/tests/http-xff-eve-forward-overwrite/test.yaml index 7b4cb958d..d233b83d4 100644 --- a/tests/http-xff-eve-forward-overwrite/test.yaml +++ b/tests/http-xff-eve-forward-overwrite/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http-xff-eve-reverse-overwrite/test.pcap + args: - -k none diff --git a/tests/http-xff-eve-reverse-extra-data/test.pcap b/tests/http-xff-eve-reverse-extra-data/test.pcap deleted file mode 100644 index 29f087e38..000000000 Binary files a/tests/http-xff-eve-reverse-extra-data/test.pcap and /dev/null differ diff --git a/tests/http-xff-eve-reverse-extra-data/test.yaml b/tests/http-xff-eve-reverse-extra-data/test.yaml index c91ccd219..c575fa882 100644 --- a/tests/http-xff-eve-reverse-extra-data/test.yaml +++ b/tests/http-xff-eve-reverse-extra-data/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http-xff-eve-reverse-overwrite/test.pcap + args: - -k none diff --git a/tests/http2-basic/input.pcap b/tests/http2-basic/input.pcap deleted file mode 100644 index 0e1ada852..000000000 Binary files a/tests/http2-basic/input.pcap and /dev/null differ diff --git a/tests/http2-basic/test.yaml b/tests/http2-basic/test.yaml index 7579cff3f..39ea03ab8 100644 --- a/tests/http2-basic/test.yaml +++ b/tests/http2-basic/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http2-keywords/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http2-disabled/input.pcap b/tests/http2-disabled/input.pcap deleted file mode 100644 index a77847ae7..000000000 Binary files a/tests/http2-disabled/input.pcap and /dev/null differ diff --git a/tests/http2-disabled/test.yaml b/tests/http2-disabled/test.yaml index a6dd9ffe4..9d33654f8 100644 --- a/tests/http2-disabled/test.yaml +++ b/tests/http2-disabled/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http2-keywords2/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/http2-files-6/input.pcap b/tests/http2-files-6/input.pcap deleted file mode 100644 index 0e1ada852..000000000 Binary files a/tests/http2-files-6/input.pcap and /dev/null differ diff --git a/tests/http2-files-6/test.yaml b/tests/http2-files-6/test.yaml index f61522bd5..0d6052751 100644 --- a/tests/http2-files-6/test.yaml +++ b/tests/http2-files-6/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http2-keywords/input.pcap + requires: features: - HAVE_NSS diff --git a/tests/http2-files/input.pcap b/tests/http2-files/input.pcap deleted file mode 100644 index 0e1ada852..000000000 Binary files a/tests/http2-files/input.pcap and /dev/null differ diff --git a/tests/http2-files/test.yaml b/tests/http2-files/test.yaml index ea4352ef4..7030680c2 100644 --- a/tests/http2-files/test.yaml +++ b/tests/http2-files/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http2-keywords/input.pcap + requires: features: - HAVE_NSS diff --git a/tests/http2-header/test.yaml b/tests/http2-header/test.yaml index 879261f16..9ed614ce7 100644 --- a/tests/http2-header/test.yaml +++ b/tests/http2-header/test.yaml @@ -1,7 +1,7 @@ requires: min-version: 7 -pcap: ../http2-basic/input.pcap +pcap: ../http2-keywords/input.pcap # disables checksum verification args: diff --git a/tests/http2-upgrade/input.pcap b/tests/http2-upgrade/input.pcap deleted file mode 100644 index a77847ae7..000000000 Binary files a/tests/http2-upgrade/input.pcap and /dev/null differ diff --git a/tests/http2-upgrade/test.yaml b/tests/http2-upgrade/test.yaml index 2050cba37..31a690691 100644 --- a/tests/http2-upgrade/test.yaml +++ b/tests/http2-upgrade/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http2-keywords2/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/icmp-hdr-01/input.pcap b/tests/icmp-hdr-01/input.pcap deleted file mode 100644 index 170b5e89d..000000000 Binary files a/tests/icmp-hdr-01/input.pcap and /dev/null differ diff --git a/tests/icmp-hdr-01/test.yaml b/tests/icmp-hdr-01/test.yaml index 15983c6af..be00c58de 100644 --- a/tests/icmp-hdr-01/test.yaml +++ b/tests/icmp-hdr-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-2190/input.pcap + requires: min-version: 6 diff --git a/tests/ikev1-transforms/ikev1-isakmp-main-mode.pcap b/tests/ikev1-transforms/ikev1-isakmp-main-mode.pcap deleted file mode 100644 index 2b1d5cf12..000000000 Binary files a/tests/ikev1-transforms/ikev1-isakmp-main-mode.pcap and /dev/null differ diff --git a/tests/ikev1-transforms/test.yaml b/tests/ikev1-transforms/test.yaml index 946575d80..75d383839 100644 --- a/tests/ikev1-transforms/test.yaml +++ b/tests/ikev1-transforms/test.yaml @@ -1,3 +1,5 @@ +pcap: ../ikev1-rules/ikev1-isakmp-main-mode.pcap + requires: features: - HAVE_NSS diff --git a/tests/ikev1/ikev1-isakmp-main-mode.pcap b/tests/ikev1/ikev1-isakmp-main-mode.pcap deleted file mode 100644 index 2b1d5cf12..000000000 Binary files a/tests/ikev1/ikev1-isakmp-main-mode.pcap and /dev/null differ diff --git a/tests/ikev1/test.yaml b/tests/ikev1/test.yaml index a14103a53..525388c8b 100644 --- a/tests/ikev1/test.yaml +++ b/tests/ikev1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../ikev1-rules/ikev1-isakmp-main-mode.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/iprep-02/input.pcap b/tests/iprep-02/input.pcap deleted file mode 100644 index 029f88567..000000000 Binary files a/tests/iprep-02/input.pcap and /dev/null differ diff --git a/tests/iprep-02/test.yaml b/tests/iprep-02/test.yaml index 542638d9b..3624886a8 100644 --- a/tests/iprep-02/test.yaml +++ b/tests/iprep-02/test.yaml @@ -4,7 +4,7 @@ requires: command: | ${SRCDIR}/src/suricata -l ${OUTPUT_DIR} \ -c ${TEST_DIR}/suricata.yaml \ - -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/iprep.rules \ + -r ../issue-4280-iprep/input.pcap -S ${TEST_DIR}/iprep.rules \ --data-dir="${OUTPUT_DIR}" \ --set default-reputation-path=${TEST_DIR} \ --set reputation-categories-file=${TEST_DIR}/scirius-categories.txt \ diff --git a/tests/issues/issue-4759/tcpdns.pcap b/tests/issues/issue-4759/tcpdns.pcap deleted file mode 100644 index c1ff33a58..000000000 Binary files a/tests/issues/issue-4759/tcpdns.pcap and /dev/null differ diff --git a/tests/issues/issue-4759/test.yaml b/tests/issues/issue-4759/test.yaml index e3063cad9..1627a4ac4 100644 --- a/tests/issues/issue-4759/test.yaml +++ b/tests/issues/issue-4759/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../issues/issue-4759.1/tcpdns.pcap + checks: - filter: count: 2 diff --git a/tests/lua-byte-extract/input.pcap b/tests/lua-byte-extract/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/lua-byte-extract/input.pcap and /dev/null differ diff --git a/tests/lua-byte-extract/test.yaml b/tests/lua-byte-extract/test.yaml index 3e2269ada..f94fcc70f 100644 --- a/tests/lua-byte-extract/test.yaml +++ b/tests/lua-byte-extract/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: min-version: 7 diff --git a/tests/lua-match-scrule/input.pcap b/tests/lua-match-scrule/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/lua-match-scrule/input.pcap and /dev/null differ diff --git a/tests/lua-match-scrule/test.yaml b/tests/lua-match-scrule/test.yaml index a7f4914de..9e536a3e8 100644 --- a/tests/lua-match-scrule/test.yaml +++ b/tests/lua-match-scrule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: min-version: 7 features: diff --git a/tests/lua-output-smtp/input.pcap b/tests/lua-output-smtp/input.pcap deleted file mode 100644 index 931b43b3b..000000000 Binary files a/tests/lua-output-smtp/input.pcap and /dev/null differ diff --git a/tests/lua-output-smtp/test.yaml b/tests/lua-output-smtp/test.yaml index ed9158c7a..c39b6c1f0 100644 --- a/tests/lua-output-smtp/test.yaml +++ b/tests/lua-output-smtp/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-smtp/input.pcap + requires: features: - HAVE_LUA diff --git a/tests/lua-scflowstats/input.pcap b/tests/lua-scflowstats/input.pcap deleted file mode 100644 index eded33a58..000000000 Binary files a/tests/lua-scflowstats/input.pcap and /dev/null differ diff --git a/tests/lua-scflowstats/test.yaml b/tests/lua-scflowstats/test.yaml index cf6159641..862c74471 100644 --- a/tests/lua-scflowstats/test.yaml +++ b/tests/lua-scflowstats/test.yaml @@ -1,3 +1,5 @@ +pcap: ../lua-output-http/input.pcap + requires: features: - HAVE_LUA diff --git a/tests/lua-scflowtuple/input.pcap b/tests/lua-scflowtuple/input.pcap deleted file mode 100644 index eded33a58..000000000 Binary files a/tests/lua-scflowtuple/input.pcap and /dev/null differ diff --git a/tests/lua-scflowtuple/test.yaml b/tests/lua-scflowtuple/test.yaml index 27e944587..523c24524 100644 --- a/tests/lua-scflowtuple/test.yaml +++ b/tests/lua-scflowtuple/test.yaml @@ -1,3 +1,5 @@ +pcap: ../lua-output-http/input.pcap + requires: features: - HAVE_LUA diff --git a/tests/lua-scpackettuple/input.pcap b/tests/lua-scpackettuple/input.pcap deleted file mode 100644 index eded33a58..000000000 Binary files a/tests/lua-scpackettuple/input.pcap and /dev/null differ diff --git a/tests/lua-scpackettuple/test.yaml b/tests/lua-scpackettuple/test.yaml index ca0f91e67..c344e1250 100644 --- a/tests/lua-scpackettuple/test.yaml +++ b/tests/lua-scpackettuple/test.yaml @@ -1,3 +1,5 @@ +pcap: ../lua-output-http/input.pcap + requires: features: - HAVE_LUA diff --git a/tests/lua-scrule-ids/input.pcap b/tests/lua-scrule-ids/input.pcap deleted file mode 100644 index 8fb6832de..000000000 Binary files a/tests/lua-scrule-ids/input.pcap and /dev/null differ diff --git a/tests/lua-scrule-ids/test.yaml b/tests/lua-scrule-ids/test.yaml index 8e4667041..75a7c41a5 100644 --- a/tests/lua-scrule-ids/test.yaml +++ b/tests/lua-scrule-ids/test.yaml @@ -1,3 +1,5 @@ +pcap: ../flowbit-oring/input.pcap + requires: features: - HAVE_LUA diff --git a/tests/mac-eve-multiple/multi_mac.pcap b/tests/mac-eve-multiple/multi_mac.pcap deleted file mode 100644 index d47e7b670..000000000 Binary files a/tests/mac-eve-multiple/multi_mac.pcap and /dev/null differ diff --git a/tests/mac-eve-multiple/test.yaml b/tests/mac-eve-multiple/test.yaml index 1fdcf34c0..27a150f14 100644 --- a/tests/mac-eve-multiple/test.yaml +++ b/tests/mac-eve-multiple/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mac-eve-multiple-disabled/multi_mac.pcap + requires: min-version: 6.0.0 files: diff --git a/tests/mac-eve-single/test.pcap b/tests/mac-eve-single/test.pcap deleted file mode 100644 index a4549a424..000000000 Binary files a/tests/mac-eve-single/test.pcap and /dev/null differ diff --git a/tests/mac-eve-single/test.yaml b/tests/mac-eve-single/test.yaml index 38f054027..f33e8822e 100644 --- a/tests/mac-eve-single/test.yaml +++ b/tests/mac-eve-single/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mac-eve-single-disabled/test.pcap + requires: min-version: 6.0.0 files: diff --git a/tests/mqtt-binary-message/mqtt5_pub_jpeg.pcap b/tests/mqtt-binary-message/mqtt5_pub_jpeg.pcap deleted file mode 100644 index fd6e90509..000000000 Binary files a/tests/mqtt-binary-message/mqtt5_pub_jpeg.pcap and /dev/null differ diff --git a/tests/mqtt-binary-message/test.yaml b/tests/mqtt-binary-message/test.yaml index 6ff46a0af..cd9b19456 100644 --- a/tests/mqtt-binary-message/test.yaml +++ b/tests/mqtt-binary-message/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mqtt-pub-rules/mqtt5_pub_jpeg.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/mqtt-limit-1/input.pcap b/tests/mqtt-limit-1/input.pcap deleted file mode 100644 index cf8fe0473..000000000 Binary files a/tests/mqtt-limit-1/input.pcap and /dev/null differ diff --git a/tests/mqtt-limit-1/test.yaml b/tests/mqtt-limit-1/test.yaml index 36fe424e9..789253501 100644 --- a/tests/mqtt-limit-1/test.yaml +++ b/tests/mqtt-limit-1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mqtt-limit-2/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/mqtt-limit-3/input.pcap b/tests/mqtt-limit-3/input.pcap deleted file mode 100644 index cf8fe0473..000000000 Binary files a/tests/mqtt-limit-3/input.pcap and /dev/null differ diff --git a/tests/mqtt-limit-3/test.yaml b/tests/mqtt-limit-3/test.yaml index 1434209b0..ce4628540 100644 --- a/tests/mqtt-limit-3/test.yaml +++ b/tests/mqtt-limit-3/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mqtt-limit-2/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/mqtt-sub-rules/mqtt5_sub_userpass.pcap b/tests/mqtt-sub-rules/mqtt5_sub_userpass.pcap deleted file mode 100644 index 52ed40e9c..000000000 Binary files a/tests/mqtt-sub-rules/mqtt5_sub_userpass.pcap and /dev/null differ diff --git a/tests/mqtt-sub-rules/test.yaml b/tests/mqtt-sub-rules/test.yaml index 117752bd4..2b909e885 100644 --- a/tests/mqtt-sub-rules/test.yaml +++ b/tests/mqtt-sub-rules/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mqtt5-sub-userpass/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/mqtt-unsub-rules/mqtt5_unsub_userpass.pcap b/tests/mqtt-unsub-rules/mqtt5_unsub_userpass.pcap deleted file mode 100644 index 3c4d235f7..000000000 Binary files a/tests/mqtt-unsub-rules/mqtt5_unsub_userpass.pcap and /dev/null differ diff --git a/tests/mqtt-unsub-rules/test.yaml b/tests/mqtt-unsub-rules/test.yaml index 573f0f85a..03c7fb725 100644 --- a/tests/mqtt-unsub-rules/test.yaml +++ b/tests/mqtt-unsub-rules/test.yaml @@ -1,3 +1,5 @@ +pcap: ../mqtt5-unsub-userpass/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/netflow-eve/input.pcap b/tests/netflow-eve/input.pcap deleted file mode 100644 index 868c57e59..000000000 Binary files a/tests/netflow-eve/input.pcap and /dev/null differ diff --git a/tests/netflow-eve/test.yaml b/tests/netflow-eve/test.yaml index 3f9ba5a15..66055893e 100644 --- a/tests/netflow-eve/test.yaml +++ b/tests/netflow-eve/test.yaml @@ -1,3 +1,5 @@ +pcap: ../eve-metadata/testmyids.pcap + checks: - filter: count: 1 diff --git a/tests/nfs-file-data-4894/input.pcap b/tests/nfs-file-data-4894/input.pcap deleted file mode 100644 index 9a94efd9e..000000000 Binary files a/tests/nfs-file-data-4894/input.pcap and /dev/null differ diff --git a/tests/nfs-file-data-4894/test.yaml b/tests/nfs-file-data-4894/test.yaml index d7095e56c..e883d6d70 100644 --- a/tests/nfs-file-data-4894/test.yaml +++ b/tests/nfs-file-data-4894/test.yaml @@ -7,7 +7,7 @@ command: | ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/etc/classification.config" \ --set reference-config-file="${SRCDIR}/etc/reference.config" -l ${OUTPUT_DIR} \ --set threshold-file="${TEST_DIR}/threshold.config" \ - -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/test.rules + -c "${SRCDIR}/suricata.yaml" -r ../detect-itype-prefilter/icmpv4-ping.pcap -S ${TEST_DIR}/test.rules checks: - shell: diff --git a/tests/nfs3-01-pre-6/input.pcap b/tests/nfs3-01-pre-6/input.pcap deleted file mode 100644 index 9a94efd9e..000000000 Binary files a/tests/nfs3-01-pre-6/input.pcap and /dev/null differ diff --git a/tests/nfs3-01-pre-6/test.yaml b/tests/nfs3-01-pre-6/test.yaml index 84762f4da..83390926c 100644 --- a/tests/nfs3-01-pre-6/test.yaml +++ b/tests/nfs3-01-pre-6/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-itype-prefilter/icmpv4-ping.pcap + requires: version: 5 diff --git a/tests/output-eve-anomaly-01/anomaly.pcap b/tests/output-eve-anomaly-01/anomaly.pcap deleted file mode 100644 index 2a7d782ee..000000000 Binary files a/tests/output-eve-anomaly-01/anomaly.pcap and /dev/null differ diff --git a/tests/output-eve-anomaly-01/test.yaml b/tests/output-eve-anomaly-01/test.yaml index e9b6f8f17..a60b4bc4d 100644 --- a/tests/output-eve-anomaly-01/test.yaml +++ b/tests/output-eve-anomaly-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-anomaly-packethdr/anomaly.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/output-eve-anomaly-03/input.pcap b/tests/output-eve-anomaly-03/input.pcap deleted file mode 100644 index d50be3325..000000000 Binary files a/tests/output-eve-anomaly-03/input.pcap and /dev/null differ diff --git a/tests/output-eve-anomaly-03/test.yaml b/tests/output-eve-anomaly-03/test.yaml index e3e7a185d..64ec21a4f 100644 --- a/tests/output-eve-anomaly-03/test.yaml +++ b/tests/output-eve-anomaly-03/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-anomaly-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/output-eve-anomaly-04.v6/input.pcap b/tests/output-eve-anomaly-04.v6/input.pcap deleted file mode 100644 index d50be3325..000000000 Binary files a/tests/output-eve-anomaly-04.v6/input.pcap and /dev/null differ diff --git a/tests/output-eve-anomaly-04.v6/test.yaml b/tests/output-eve-anomaly-04.v6/test.yaml index 49122a136..a05e365b0 100644 --- a/tests/output-eve-anomaly-04.v6/test.yaml +++ b/tests/output-eve-anomaly-04.v6/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-anomaly-02/input.pcap + requires: lt-version: 7 diff --git a/tests/output-eve-anomaly-04/input.pcap b/tests/output-eve-anomaly-04/input.pcap deleted file mode 100644 index d50be3325..000000000 Binary files a/tests/output-eve-anomaly-04/input.pcap and /dev/null differ diff --git a/tests/output-eve-anomaly-04/test.yaml b/tests/output-eve-anomaly-04/test.yaml index 244b69448..a5f5c2084 100644 --- a/tests/output-eve-anomaly-04/test.yaml +++ b/tests/output-eve-anomaly-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-anomaly-02/input.pcap + requires: min-version: 7 diff --git a/tests/output-eve-anomaly-05/input.pcap b/tests/output-eve-anomaly-05/input.pcap deleted file mode 100644 index d50be3325..000000000 Binary files a/tests/output-eve-anomaly-05/input.pcap and /dev/null differ diff --git a/tests/output-eve-anomaly-05/test.yaml b/tests/output-eve-anomaly-05/test.yaml index 66bb464e2..3cbd33492 100644 --- a/tests/output-eve-anomaly-05/test.yaml +++ b/tests/output-eve-anomaly-05/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-anomaly-02/input.pcap + requires: min-version: 6 diff --git a/tests/output-eve-dhcp-01/input.pcap b/tests/output-eve-dhcp-01/input.pcap deleted file mode 100644 index 93617129f..000000000 Binary files a/tests/output-eve-dhcp-01/input.pcap and /dev/null differ diff --git a/tests/output-eve-dhcp-01/test.yaml b/tests/output-eve-dhcp-01/test.yaml index 9027da0d0..16bd749d9 100644 --- a/tests/output-eve-dhcp-01/test.yaml +++ b/tests/output-eve-dhcp-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../dhcp-eve-extended/input.pcap + requires: features: - RUST diff --git a/tests/output-eve-ftp/input.pcap b/tests/output-eve-ftp/input.pcap deleted file mode 100644 index 3b2dc2bb8..000000000 Binary files a/tests/output-eve-ftp/input.pcap and /dev/null differ diff --git a/tests/output-eve-ftp/test.yaml b/tests/output-eve-ftp/test.yaml index c550f1eae..5b4ea1c90 100644 --- a/tests/output-eve-ftp/test.yaml +++ b/tests/output-eve-ftp/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3519/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/output-eve-rdp-01/input.pcap b/tests/output-eve-rdp-01/input.pcap deleted file mode 100644 index d7e8e8450..000000000 Binary files a/tests/output-eve-rdp-01/input.pcap and /dev/null differ diff --git a/tests/output-eve-rdp-01/test.yaml b/tests/output-eve-rdp-01/test.yaml index f9c80d662..447ab2831 100644 --- a/tests/output-eve-rdp-01/test.yaml +++ b/tests/output-eve-rdp-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../rdp-protocol/RDP-003.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/output-pcap-log-conditional-alert/input.pcap b/tests/output-pcap-log-conditional-alert/input.pcap deleted file mode 100644 index eded33a58..000000000 Binary files a/tests/output-pcap-log-conditional-alert/input.pcap and /dev/null differ diff --git a/tests/output-pcap-log-conditional-alert/test.yaml b/tests/output-pcap-log-conditional-alert/test.yaml index 97abdb517..ee5202773 100644 --- a/tests/output-pcap-log-conditional-alert/test.yaml +++ b/tests/output-pcap-log-conditional-alert/test.yaml @@ -1,3 +1,5 @@ +pcap: ../lua-output-http/input.pcap + requires: min-version: 7 diff --git a/tests/output-pcap-log-conditional-noalert/input.pcap b/tests/output-pcap-log-conditional-noalert/input.pcap deleted file mode 100644 index eded33a58..000000000 Binary files a/tests/output-pcap-log-conditional-noalert/input.pcap and /dev/null differ diff --git a/tests/output-pcap-log-conditional-noalert/test.yaml b/tests/output-pcap-log-conditional-noalert/test.yaml index 5a7c949e5..43007eaef 100644 --- a/tests/output-pcap-log-conditional-noalert/test.yaml +++ b/tests/output-pcap-log-conditional-noalert/test.yaml @@ -1,3 +1,5 @@ +pcap: ../lua-output-http/input.pcap + checks: - shell: args: test ! -e log.pcap.0 diff --git a/tests/output-tcp-data/input.pcap b/tests/output-tcp-data/input.pcap deleted file mode 100644 index eded33a58..000000000 Binary files a/tests/output-tcp-data/input.pcap and /dev/null differ diff --git a/tests/output-tcp-data/test.yaml b/tests/output-tcp-data/test.yaml index b72df8703..1decf121a 100644 --- a/tests/output-tcp-data/test.yaml +++ b/tests/output-tcp-data/test.yaml @@ -1,3 +1,5 @@ +pcap: ../lua-output-http/input.pcap + checks: - file-compare: filename: tcp-data.log diff --git a/tests/pcap-log-lz4-write/test.yaml b/tests/pcap-log-lz4-write/test.yaml index 086223301..1c108ae81 100644 --- a/tests/pcap-log-lz4-write/test.yaml +++ b/tests/pcap-log-lz4-write/test.yaml @@ -13,7 +13,7 @@ setup: mkdir pcap-log chmod 555 pcap-log -pcap: ../alert-testmyids/input.pcap +pcap: ../flowbit-oring/input.pcap checks: - filter: diff --git a/tests/pcre-invalid-rule-01/input.pcap b/tests/pcre-invalid-rule-01/input.pcap deleted file mode 100644 index bc6ba8ff9..000000000 Binary files a/tests/pcre-invalid-rule-01/input.pcap and /dev/null differ diff --git a/tests/pcre-invalid-rule-01/test.yaml b/tests/pcre-invalid-rule-01/test.yaml index 564c9f8df..996b4f9a7 100644 --- a/tests/pcre-invalid-rule-01/test.yaml +++ b/tests/pcre-invalid-rule-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-dotprefix-01/input.pcap + requires: min-version: 6 diff --git a/tests/proto-mismatch-http-ssh/input.pcap b/tests/proto-mismatch-http-ssh/input.pcap deleted file mode 100644 index d50be3325..000000000 Binary files a/tests/proto-mismatch-http-ssh/input.pcap and /dev/null differ diff --git a/tests/proto-mismatch-http-ssh/test.yaml b/tests/proto-mismatch-http-ssh/test.yaml index 7ded94e24..9599271f0 100644 --- a/tests/proto-mismatch-http-ssh/test.yaml +++ b/tests/proto-mismatch-http-ssh/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-anomaly-02/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/reference-config-validate-02/input.pcap b/tests/reference-config-validate-02/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/reference-config-validate-02/input.pcap and /dev/null differ diff --git a/tests/reference-config-validate-02/test.yaml b/tests/reference-config-validate-02/test.yaml index d403eec05..de07609f8 100644 --- a/tests/reference-config-validate-02/test.yaml +++ b/tests/reference-config-validate-02/test.yaml @@ -2,7 +2,7 @@ requires: min-version: 7 command: | - ${SRCDIR}/src/suricata -v --set reference-config-file="${TEST_DIR}/reference.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -r ${TEST_DIR}/input.pcap + ${SRCDIR}/src/suricata -v --set reference-config-file="${TEST_DIR}/reference.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -r ../detect-pcrexform-01/input.pcap checks: diff --git a/tests/rfb-protocol-3.7/00-vnc-openwall-3.7.pcap b/tests/rfb-protocol-3.7/00-vnc-openwall-3.7.pcap deleted file mode 100644 index f1e91c2d9..000000000 Binary files a/tests/rfb-protocol-3.7/00-vnc-openwall-3.7.pcap and /dev/null differ diff --git a/tests/rfb-protocol-3.7/test.yaml b/tests/rfb-protocol-3.7/test.yaml index 88b65befb..7e98230b5 100644 --- a/tests/rfb-protocol-3.7/test.yaml +++ b/tests/rfb-protocol-3.7/test.yaml @@ -1,3 +1,5 @@ +pcap: ../rfb-rules/00-vnc-openwall-3.7.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/smb-dce_opnum/input.pcap b/tests/smb-dce_opnum/input.pcap deleted file mode 100644 index 1897e467c..000000000 Binary files a/tests/smb-dce_opnum/input.pcap and /dev/null differ diff --git a/tests/smb-dce_opnum/test.yaml b/tests/smb-dce_opnum/test.yaml index ad8032e5a..e5aa35564 100644 --- a/tests/smb-dce_opnum/test.yaml +++ b/tests/smb-dce_opnum/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb-dce_iface/input.pcap + requires: min-version: 6 diff --git a/tests/smb-eicar-file-frames/input.pcap b/tests/smb-eicar-file-frames/input.pcap deleted file mode 100644 index e97b433c4..000000000 Binary files a/tests/smb-eicar-file-frames/input.pcap and /dev/null differ diff --git a/tests/smb-eicar-file-frames/test.yaml b/tests/smb-eicar-file-frames/test.yaml index a6b45a922..b843c78bc 100644 --- a/tests/smb-eicar-file-frames/test.yaml +++ b/tests/smb-eicar-file-frames/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb-eicar-file/input.pcap + requires: min-version: 7 diff --git a/tests/smb-named-pipe-ascii-frames/input.pcap b/tests/smb-named-pipe-ascii-frames/input.pcap deleted file mode 100644 index e0dfc897b..000000000 Binary files a/tests/smb-named-pipe-ascii-frames/input.pcap and /dev/null differ diff --git a/tests/smb-named-pipe-ascii-frames/test.yaml b/tests/smb-named-pipe-ascii-frames/test.yaml index c50c51d0c..d9dd03b23 100644 --- a/tests/smb-named-pipe-ascii-frames/test.yaml +++ b/tests/smb-named-pipe-ascii-frames/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb-named-pipe-ascii/input.pcap + requires: min-version: 7 diff --git a/tests/smb-named-pipe-unicode/input.pcap b/tests/smb-named-pipe-unicode/input.pcap deleted file mode 100644 index 06ac59f68..000000000 Binary files a/tests/smb-named-pipe-unicode/input.pcap and /dev/null differ diff --git a/tests/smb-named-pipe-unicode/test.yaml b/tests/smb-named-pipe-unicode/test.yaml index 54b53cc40..43a34c647 100644 --- a/tests/smb-named-pipe-unicode/test.yaml +++ b/tests/smb-named-pipe-unicode/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-smb-01/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/smb2-02/smb2.pcap b/tests/smb2-02/smb2.pcap deleted file mode 100644 index 49c711601..000000000 Binary files a/tests/smb2-02/smb2.pcap and /dev/null differ diff --git a/tests/smb2-02/test.yaml b/tests/smb2-02/test.yaml index 5070f36ec..443d86d52 100644 --- a/tests/smb2-02/test.yaml +++ b/tests/smb2-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb2-03-rule/smb2.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/smb2-07-frames/20171220_smb_psexec_add_user.pcap b/tests/smb2-07-frames/20171220_smb_psexec_add_user.pcap deleted file mode 100644 index d0f5196fd..000000000 Binary files a/tests/smb2-07-frames/20171220_smb_psexec_add_user.pcap and /dev/null differ diff --git a/tests/smb2-07-frames/test.yaml b/tests/smb2-07-frames/test.yaml index de5d53269..3f7d0180a 100644 --- a/tests/smb2-07-frames/test.yaml +++ b/tests/smb2-07-frames/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb2-07/20171220_smb_psexec_add_user.pcap + requires: min-version: 7 diff --git a/tests/smb2-08-rule/smb2.pcap b/tests/smb2-08-rule/smb2.pcap deleted file mode 100644 index 49c711601..000000000 Binary files a/tests/smb2-08-rule/smb2.pcap and /dev/null differ diff --git a/tests/smb2-08-rule/test.yaml b/tests/smb2-08-rule/test.yaml index 4c74dd6ce..4411e306f 100644 --- a/tests/smb2-08-rule/test.yaml +++ b/tests/smb2-08-rule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb2-03-rule/smb2.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/smtp-eve/input.pcap b/tests/smtp-eve/input.pcap deleted file mode 100644 index 931b43b3b..000000000 Binary files a/tests/smtp-eve/input.pcap and /dev/null differ diff --git a/tests/smtp-eve/test.yaml b/tests/smtp-eve/test.yaml index 3fd28caab..03876091b 100644 --- a/tests/smtp-eve/test.yaml +++ b/tests/smtp-eve/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-smtp/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/smtp-file-data-02/input.pcap b/tests/smtp-file-data-02/input.pcap deleted file mode 100644 index 931b43b3b..000000000 Binary files a/tests/smtp-file-data-02/input.pcap and /dev/null differ diff --git a/tests/smtp-file-data-02/test.yaml b/tests/smtp-file-data-02/test.yaml index fd6a8b01c..63709c2a4 100644 --- a/tests/smtp-file-data-02/test.yaml +++ b/tests/smtp-file-data-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-smtp/input.pcap + requires: min-version: 6 diff --git a/tests/smtp-md5/input.pcap b/tests/smtp-md5/input.pcap deleted file mode 100644 index 931b43b3b..000000000 Binary files a/tests/smtp-md5/input.pcap and /dev/null differ diff --git a/tests/smtp-md5/test.yaml b/tests/smtp-md5/test.yaml index 77bfe1a64..dae7ad552 100644 --- a/tests/smtp-md5/test.yaml +++ b/tests/smtp-md5/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-smtp/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/smtp-url-schemes-bug-5174/input.pcap b/tests/smtp-url-schemes-bug-5174/input.pcap deleted file mode 100644 index bc1daa891..000000000 Binary files a/tests/smtp-url-schemes-bug-5174/input.pcap and /dev/null differ diff --git a/tests/smtp-url-schemes-bug-5174/test.yaml b/tests/smtp-url-schemes-bug-5174/test.yaml index b9e4b314e..2953e2f06 100644 --- a/tests/smtp-url-schemes-bug-5174/test.yaml +++ b/tests/smtp-url-schemes-bug-5174/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smtp-extract-url-schemes/input.pcap + checks: - filter: count: 1 diff --git a/tests/smtp/input.pcap b/tests/smtp/input.pcap deleted file mode 100644 index 931b43b3b..000000000 Binary files a/tests/smtp/input.pcap and /dev/null differ diff --git a/tests/smtp/test.yaml b/tests/smtp/test.yaml index 534456919..715ade4bf 100644 --- a/tests/smtp/test.yaml +++ b/tests/smtp/test.yaml @@ -1,3 +1,5 @@ +pcap: ../bug-3616-smtp/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/stream-depth-reached-event/input.pcap b/tests/stream-depth-reached-event/input.pcap deleted file mode 100644 index 49c711601..000000000 Binary files a/tests/stream-depth-reached-event/input.pcap and /dev/null differ diff --git a/tests/stream-depth-reached-event/test.yaml b/tests/stream-depth-reached-event/test.yaml index 2a293f455..1e37bb6a3 100644 --- a/tests/stream-depth-reached-event/test.yaml +++ b/tests/stream-depth-reached-event/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb2-03-rule/smb2.pcap + requires: min-version: 7 diff --git a/tests/streamsize-keyword/input.pcap b/tests/streamsize-keyword/input.pcap deleted file mode 100644 index e97b433c4..000000000 Binary files a/tests/streamsize-keyword/input.pcap and /dev/null differ diff --git a/tests/streamsize-keyword/test.yaml b/tests/streamsize-keyword/test.yaml index 19401dd88..c07e98798 100644 --- a/tests/streamsize-keyword/test.yaml +++ b/tests/streamsize-keyword/test.yaml @@ -1,3 +1,5 @@ +pcap: ../smb-eicar-file/input.pcap + # disables checksum verification args: - -k none diff --git a/tests/tcp-fastopen-02/test.yaml b/tests/tcp-fastopen-02/test.yaml index e8aa728ba..6265ed426 100644 --- a/tests/tcp-fastopen-02/test.yaml +++ b/tests/tcp-fastopen-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../tcp-fastopen-01/tfo.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/tcp-fastopen-02/tfo.pcap b/tests/tcp-fastopen-02/tfo.pcap deleted file mode 100644 index 2893440fa..000000000 Binary files a/tests/tcp-fastopen-02/tfo.pcap and /dev/null differ diff --git a/tests/tcp-fastopen-04/test.yaml b/tests/tcp-fastopen-04/test.yaml index eccfc0c74..ecf790f9f 100644 --- a/tests/tcp-fastopen-04/test.yaml +++ b/tests/tcp-fastopen-04/test.yaml @@ -1,3 +1,5 @@ +pcap: ../tcp-fastopen-05/tfo.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/tcp-fastopen-04/tfo.pcap b/tests/tcp-fastopen-04/tfo.pcap deleted file mode 100644 index 7d9c9b48b..000000000 Binary files a/tests/tcp-fastopen-04/tfo.pcap and /dev/null differ diff --git a/tests/test-bsize-values-1/input.pcap b/tests/test-bsize-values-1/input.pcap deleted file mode 100644 index f2e7b947e..000000000 Binary files a/tests/test-bsize-values-1/input.pcap and /dev/null differ diff --git a/tests/test-bsize-values-1/test.yaml b/tests/test-bsize-values-1/test.yaml index 7c22c8720..70ea5e206 100644 --- a/tests/test-bsize-values-1/test.yaml +++ b/tests/test-bsize-values-1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../test-bsize-values-2/input.pcap + args: - -k none diff --git a/tests/test-unreachable-distance-1/input.pcap b/tests/test-unreachable-distance-1/input.pcap deleted file mode 100644 index bc6ba8ff9..000000000 Binary files a/tests/test-unreachable-distance-1/input.pcap and /dev/null differ diff --git a/tests/test-unreachable-distance-1/test.yaml b/tests/test-unreachable-distance-1/test.yaml index cd7813e0d..842400597 100644 --- a/tests/test-unreachable-distance-1/test.yaml +++ b/tests/test-unreachable-distance-1/test.yaml @@ -1,3 +1,5 @@ +pcap: ../detect-dotprefix-01/input.pcap + requires: min-version: 8 # TODO diff --git a/tests/tftp-tx-handling-rrq/input.pcap b/tests/tftp-tx-handling-rrq/input.pcap deleted file mode 100644 index 6c5efa8ba..000000000 Binary files a/tests/tftp-tx-handling-rrq/input.pcap and /dev/null differ diff --git a/tests/tftp-tx-handling-rrq/test.yaml b/tests/tftp-tx-handling-rrq/test.yaml index 0596a6579..81c8a2cd2 100644 --- a/tests/tftp-tx-handling-rrq/test.yaml +++ b/tests/tftp-tx-handling-rrq/test.yaml @@ -1,3 +1,5 @@ +pcap: ../output-eve-tftp-01/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/threshold-config-byrule/input.pcap b/tests/threshold-config-byrule/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold-config-byrule/input.pcap and /dev/null differ diff --git a/tests/threshold-config-byrule/test.yaml b/tests/threshold-config-byrule/test.yaml index ca16235c5..56d093f1e 100644 --- a/tests/threshold-config-byrule/test.yaml +++ b/tests/threshold-config-byrule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold-config-validate-02/input.pcap b/tests/threshold-config-validate-02/input.pcap deleted file mode 100644 index dc92bd963..000000000 Binary files a/tests/threshold-config-validate-02/input.pcap and /dev/null differ diff --git a/tests/threshold-config-validate-02/test.yaml b/tests/threshold-config-validate-02/test.yaml index d605840d0..ff9a9e3ad 100644 --- a/tests/threshold-config-validate-02/test.yaml +++ b/tests/threshold-config-validate-02/test.yaml @@ -2,7 +2,7 @@ requires: min-version: 7 command: | - ${SRCDIR}/src/suricata -v --set threshold-file="${TEST_DIR}/threshold.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -r ${TEST_DIR}/input.pcap + ${SRCDIR}/src/suricata -v --set threshold-file="${TEST_DIR}/threshold.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -r ../detect-pcrexform-01/input.pcap checks: diff --git a/tests/threshold/threshold-config-rate-filter-alert-hostdst/input.pcap b/tests/threshold/threshold-config-rate-filter-alert-hostdst/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-alert-hostdst/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-alert-hostdst/test.yaml b/tests/threshold/threshold-config-rate-filter-alert-hostdst/test.yaml index 91a0d1564..de5eb0c60 100644 --- a/tests/threshold/threshold-config-rate-filter-alert-hostdst/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-alert-hostdst/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-alert-hostsrc/input.pcap b/tests/threshold/threshold-config-rate-filter-alert-hostsrc/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-alert-hostsrc/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-alert-hostsrc/test.yaml b/tests/threshold/threshold-config-rate-filter-alert-hostsrc/test.yaml index 91a0d1564..de5eb0c60 100644 --- a/tests/threshold/threshold-config-rate-filter-alert-hostsrc/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-alert-hostsrc/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-alert-pair/input.pcap b/tests/threshold/threshold-config-rate-filter-alert-pair/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-alert-pair/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-alert-pair/test.yaml b/tests/threshold/threshold-config-rate-filter-alert-pair/test.yaml index bbc6465b9..8e42ac187 100644 --- a/tests/threshold/threshold-config-rate-filter-alert-pair/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-alert-pair/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-alert-rule/input.pcap b/tests/threshold/threshold-config-rate-filter-alert-rule/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-alert-rule/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-alert-rule/test.yaml b/tests/threshold/threshold-config-rate-filter-alert-rule/test.yaml index bbc6465b9..8e42ac187 100644 --- a/tests/threshold/threshold-config-rate-filter-alert-rule/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-alert-rule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-drop-hostdst/input.pcap b/tests/threshold/threshold-config-rate-filter-drop-hostdst/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-drop-hostdst/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-drop-hostdst/test.yaml b/tests/threshold/threshold-config-rate-filter-drop-hostdst/test.yaml index 3c0eddff6..0e25dad0f 100644 --- a/tests/threshold/threshold-config-rate-filter-drop-hostdst/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-drop-hostdst/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-drop-hostsrc/input.pcap b/tests/threshold/threshold-config-rate-filter-drop-hostsrc/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-drop-hostsrc/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-drop-hostsrc/test.yaml b/tests/threshold/threshold-config-rate-filter-drop-hostsrc/test.yaml index a333cc9aa..bbeacabea 100644 --- a/tests/threshold/threshold-config-rate-filter-drop-hostsrc/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-drop-hostsrc/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-drop-ippair/input.pcap b/tests/threshold/threshold-config-rate-filter-drop-ippair/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-drop-ippair/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-drop-ippair/test.yaml b/tests/threshold/threshold-config-rate-filter-drop-ippair/test.yaml index 012af667a..69d52c16c 100644 --- a/tests/threshold/threshold-config-rate-filter-drop-ippair/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-drop-ippair/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-drop-rule/input.pcap b/tests/threshold/threshold-config-rate-filter-drop-rule/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-drop-rule/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-drop-rule/test.yaml b/tests/threshold/threshold-config-rate-filter-drop-rule/test.yaml index ec6a9f076..bc8d556bd 100644 --- a/tests/threshold/threshold-config-rate-filter-drop-rule/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-drop-rule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-pass-hostdst/input.pcap b/tests/threshold/threshold-config-rate-filter-pass-hostdst/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-pass-hostdst/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-pass-hostdst/test.yaml b/tests/threshold/threshold-config-rate-filter-pass-hostdst/test.yaml index 7619df6be..3429aed1e 100644 --- a/tests/threshold/threshold-config-rate-filter-pass-hostdst/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-pass-hostdst/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-pass-hostsrc/input.pcap b/tests/threshold/threshold-config-rate-filter-pass-hostsrc/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-pass-hostsrc/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-pass-hostsrc/test.yaml b/tests/threshold/threshold-config-rate-filter-pass-hostsrc/test.yaml index 7619df6be..3429aed1e 100644 --- a/tests/threshold/threshold-config-rate-filter-pass-hostsrc/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-pass-hostsrc/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-pass-pair/input.pcap b/tests/threshold/threshold-config-rate-filter-pass-pair/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-pass-pair/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-pass-pair/test.yaml b/tests/threshold/threshold-config-rate-filter-pass-pair/test.yaml index 9ae94185e..5e042458e 100644 --- a/tests/threshold/threshold-config-rate-filter-pass-pair/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-pass-pair/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-pass-rule/input.pcap b/tests/threshold/threshold-config-rate-filter-pass-rule/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-pass-rule/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-pass-rule/test.yaml b/tests/threshold/threshold-config-rate-filter-pass-rule/test.yaml index 9ae94185e..5e042458e 100644 --- a/tests/threshold/threshold-config-rate-filter-pass-rule/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-pass-rule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-reject-hostdst/input.pcap b/tests/threshold/threshold-config-rate-filter-reject-hostdst/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-reject-hostdst/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-reject-hostdst/test.yaml b/tests/threshold/threshold-config-rate-filter-reject-hostdst/test.yaml index a333cc9aa..bbeacabea 100644 --- a/tests/threshold/threshold-config-rate-filter-reject-hostdst/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-reject-hostdst/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-reject-hostsrc/input.pcap b/tests/threshold/threshold-config-rate-filter-reject-hostsrc/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-reject-hostsrc/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-reject-hostsrc/test.yaml b/tests/threshold/threshold-config-rate-filter-reject-hostsrc/test.yaml index a333cc9aa..bbeacabea 100644 --- a/tests/threshold/threshold-config-rate-filter-reject-hostsrc/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-reject-hostsrc/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-reject-pair/input.pcap b/tests/threshold/threshold-config-rate-filter-reject-pair/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-reject-pair/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-reject-pair/test.yaml b/tests/threshold/threshold-config-rate-filter-reject-pair/test.yaml index 012af667a..69d52c16c 100644 --- a/tests/threshold/threshold-config-rate-filter-reject-pair/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-reject-pair/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-rate-filter-reject-rule/input.pcap b/tests/threshold/threshold-config-rate-filter-reject-rule/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-rate-filter-reject-rule/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-rate-filter-reject-rule/test.yaml b/tests/threshold/threshold-config-rate-filter-reject-rule/test.yaml index ec6a9f076..bc8d556bd 100644 --- a/tests/threshold/threshold-config-rate-filter-reject-rule/test.yaml +++ b/tests/threshold/threshold-config-rate-filter-reject-rule/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-bydst-ip/input.pcap b/tests/threshold/threshold-config-suppress-bydst-ip/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-bydst-ip/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-bydst-ip/test.yaml b/tests/threshold/threshold-config-suppress-bydst-ip/test.yaml index 58392f3a3..c65f3f83d 100644 --- a/tests/threshold/threshold-config-suppress-bydst-ip/test.yaml +++ b/tests/threshold/threshold-config-suppress-bydst-ip/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-bydst-ipsubnet/input.pcap b/tests/threshold/threshold-config-suppress-bydst-ipsubnet/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-bydst-ipsubnet/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-bydst-ipsubnet/test.yaml b/tests/threshold/threshold-config-suppress-bydst-ipsubnet/test.yaml index 58392f3a3..c65f3f83d 100644 --- a/tests/threshold/threshold-config-suppress-bydst-ipsubnet/test.yaml +++ b/tests/threshold/threshold-config-suppress-bydst-ipsubnet/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-bydst-ipvar/input.pcap b/tests/threshold/threshold-config-suppress-bydst-ipvar/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-bydst-ipvar/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-bydst-ipvar/test.yaml b/tests/threshold/threshold-config-suppress-bydst-ipvar/test.yaml index 58392f3a3..c65f3f83d 100644 --- a/tests/threshold/threshold-config-suppress-bydst-ipvar/test.yaml +++ b/tests/threshold/threshold-config-suppress-bydst-ipvar/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-byeither-ip/input.pcap b/tests/threshold/threshold-config-suppress-byeither-ip/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-byeither-ip/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-byeither-ip/test.yaml b/tests/threshold/threshold-config-suppress-byeither-ip/test.yaml index 11a7b5332..418a2c5c9 100644 --- a/tests/threshold/threshold-config-suppress-byeither-ip/test.yaml +++ b/tests/threshold/threshold-config-suppress-byeither-ip/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-byeither-ipsubnet/input.pcap b/tests/threshold/threshold-config-suppress-byeither-ipsubnet/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-byeither-ipsubnet/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-byeither-ipsubnet/test.yaml b/tests/threshold/threshold-config-suppress-byeither-ipsubnet/test.yaml index 11a7b5332..418a2c5c9 100644 --- a/tests/threshold/threshold-config-suppress-byeither-ipsubnet/test.yaml +++ b/tests/threshold/threshold-config-suppress-byeither-ipsubnet/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-byeither-ipvar/input.pcap b/tests/threshold/threshold-config-suppress-byeither-ipvar/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-byeither-ipvar/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-byeither-ipvar/test.yaml b/tests/threshold/threshold-config-suppress-byeither-ipvar/test.yaml index 11a7b5332..418a2c5c9 100644 --- a/tests/threshold/threshold-config-suppress-byeither-ipvar/test.yaml +++ b/tests/threshold/threshold-config-suppress-byeither-ipvar/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-bysrc-ip/input.pcap b/tests/threshold/threshold-config-suppress-bysrc-ip/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-bysrc-ip/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-bysrc-ip/test.yaml b/tests/threshold/threshold-config-suppress-bysrc-ip/test.yaml index 65c1dea58..eac7601c5 100644 --- a/tests/threshold/threshold-config-suppress-bysrc-ip/test.yaml +++ b/tests/threshold/threshold-config-suppress-bysrc-ip/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/input.pcap b/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/test.yaml b/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/test.yaml index 65c1dea58..eac7601c5 100644 --- a/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/test.yaml +++ b/tests/threshold/threshold-config-suppress-bysrc-ipsubnet/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/threshold/threshold-config-suppress-bysrc-ipvar/input.pcap b/tests/threshold/threshold-config-suppress-bysrc-ipvar/input.pcap deleted file mode 100644 index bf5caebc4..000000000 Binary files a/tests/threshold/threshold-config-suppress-bysrc-ipvar/input.pcap and /dev/null differ diff --git a/tests/threshold/threshold-config-suppress-bysrc-ipvar/test.yaml b/tests/threshold/threshold-config-suppress-bysrc-ipvar/test.yaml index 65c1dea58..eac7601c5 100644 --- a/tests/threshold/threshold-config-suppress-bysrc-ipvar/test.yaml +++ b/tests/threshold/threshold-config-suppress-bysrc-ipvar/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../http-all-headers/input.pcap + requires: min-version: 7 diff --git a/tests/tls/tls-ja3s/input.pcap b/tests/tls/tls-ja3s/input.pcap deleted file mode 100644 index f50866f1e..000000000 Binary files a/tests/tls/tls-ja3s/input.pcap and /dev/null differ diff --git a/tests/tls/tls-ja3s/test.yaml b/tests/tls/tls-ja3s/test.yaml index 42b5e3b15..c7a9719db 100644 --- a/tests/tls/tls-ja3s/test.yaml +++ b/tests/tls/tls-ja3s/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../tls/tls-certs-alert/input.pcap + requires: min-version: 5.0.0 features: diff --git a/tests/tls/tls-json-output-ids/input.pcap b/tests/tls/tls-json-output-ids/input.pcap deleted file mode 100644 index 5128c95f7..000000000 Binary files a/tests/tls/tls-json-output-ids/input.pcap and /dev/null differ diff --git a/tests/tls/tls-json-output-ids/test.yaml b/tests/tls/tls-json-output-ids/test.yaml index 7092e6a5c..107233fcc 100644 --- a/tests/tls/tls-json-output-ids/test.yaml +++ b/tests/tls/tls-json-output-ids/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../tls/tls-fingerprint-alert/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/tls/tls-json-output-ips/input.pcap b/tests/tls/tls-json-output-ips/input.pcap deleted file mode 100644 index 5128c95f7..000000000 Binary files a/tests/tls/tls-json-output-ips/input.pcap and /dev/null differ diff --git a/tests/tls/tls-json-output-ips/test.yaml b/tests/tls/tls-json-output-ips/test.yaml index 7092e6a5c..107233fcc 100644 --- a/tests/tls/tls-json-output-ips/test.yaml +++ b/tests/tls/tls-json-output-ips/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../tls/tls-fingerprint-alert/input.pcap + requires: features: - HAVE_LIBJANSSON diff --git a/tests/tls/tls13-draft28-frames/test.yaml b/tests/tls/tls13-draft28-frames/test.yaml index 456f2dcef..4ff3cc98e 100644 --- a/tests/tls/tls13-draft28-frames/test.yaml +++ b/tests/tls/tls13-draft28-frames/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../tls/tls13-draft28/tls13_draft28.pcap + requires: min-version: 7 diff --git a/tests/tls/tls13-draft28-frames/tls13_draft28.pcap b/tests/tls/tls13-draft28-frames/tls13_draft28.pcap deleted file mode 100644 index 0f4bf1e04..000000000 Binary files a/tests/tls/tls13-draft28-frames/tls13_draft28.pcap and /dev/null differ diff --git a/tests/udp-5379/udp-hlen-invalid-non-strict/input.pcap b/tests/udp-5379/udp-hlen-invalid-non-strict/input.pcap deleted file mode 100644 index 3e9328028..000000000 Binary files a/tests/udp-5379/udp-hlen-invalid-non-strict/input.pcap and /dev/null differ diff --git a/tests/udp-5379/udp-hlen-invalid-non-strict/test.yaml b/tests/udp-5379/udp-hlen-invalid-non-strict/test.yaml index 248e71064..65acf1d1a 100644 --- a/tests/udp-5379/udp-hlen-invalid-non-strict/test.yaml +++ b/tests/udp-5379/udp-hlen-invalid-non-strict/test.yaml @@ -1,10 +1,12 @@ +pcap: ../../udp-5379/udp-hlen-invalid-strict/input.pcap + exit-code: 0 command: | ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/etc/classification.config" \ --set reference-config-file="${SRCDIR}/etc/reference.config" -l ${OUTPUT_DIR} \ --set threshold-file="${TEST_DIR}/threshold.config" \ - -c "${SRCDIR}/suricata.yaml" -r ${TEST_DIR}/input.pcap -S ${TEST_DIR}/test.rules + -c "${SRCDIR}/suricata.yaml" -r ../../udp-5379/udp-hlen-invalid-strict/input.pcap -S ${TEST_DIR}/test.rules checks: - shell: diff --git a/tests/util-action-tests/util-action-01/input.pcap b/tests/util-action-tests/util-action-01/input.pcap deleted file mode 100644 index 95dd0d89a..000000000 Binary files a/tests/util-action-tests/util-action-01/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-01/test.yaml b/tests/util-action-tests/util-action-01/test.yaml index 7fcc2044d..806208841 100644 --- a/tests/util-action-tests/util-action-01/test.yaml +++ b/tests/util-action-tests/util-action-01/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-13/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-02/input.pcap b/tests/util-action-tests/util-action-02/input.pcap deleted file mode 100644 index 95dd0d89a..000000000 Binary files a/tests/util-action-tests/util-action-02/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-02/test.yaml b/tests/util-action-tests/util-action-02/test.yaml index dcdfdf0ea..f8bd99bdc 100644 --- a/tests/util-action-tests/util-action-02/test.yaml +++ b/tests/util-action-tests/util-action-02/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-13/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-07/input.pcap b/tests/util-action-tests/util-action-07/input.pcap deleted file mode 100644 index f50dc35ef..000000000 Binary files a/tests/util-action-tests/util-action-07/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-07/test.yaml b/tests/util-action-tests/util-action-07/test.yaml index 6e260b4c6..aba4db41a 100644 --- a/tests/util-action-tests/util-action-07/test.yaml +++ b/tests/util-action-tests/util-action-07/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-10/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-09/input.pcap b/tests/util-action-tests/util-action-09/input.pcap deleted file mode 100644 index f50dc35ef..000000000 Binary files a/tests/util-action-tests/util-action-09/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-09/test.yaml b/tests/util-action-tests/util-action-09/test.yaml index 9c534f5cf..4fe8650e2 100644 --- a/tests/util-action-tests/util-action-09/test.yaml +++ b/tests/util-action-tests/util-action-09/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-10/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-11/input.pcap b/tests/util-action-tests/util-action-11/input.pcap deleted file mode 100644 index 95dd0d89a..000000000 Binary files a/tests/util-action-tests/util-action-11/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-11/test.yaml b/tests/util-action-tests/util-action-11/test.yaml index e99b42b83..865057391 100644 --- a/tests/util-action-tests/util-action-11/test.yaml +++ b/tests/util-action-tests/util-action-11/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-13/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-14/input.pcap b/tests/util-action-tests/util-action-14/input.pcap deleted file mode 100644 index 95dd0d89a..000000000 Binary files a/tests/util-action-tests/util-action-14/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-14/test.yaml b/tests/util-action-tests/util-action-14/test.yaml index a25c45036..2ee5556a5 100644 --- a/tests/util-action-tests/util-action-14/test.yaml +++ b/tests/util-action-tests/util-action-14/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-13/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-15/input.pcap b/tests/util-action-tests/util-action-15/input.pcap deleted file mode 100644 index 95dd0d89a..000000000 Binary files a/tests/util-action-tests/util-action-15/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-15/test.yaml b/tests/util-action-tests/util-action-15/test.yaml index 0df9caec5..50e156d67 100644 --- a/tests/util-action-tests/util-action-15/test.yaml +++ b/tests/util-action-tests/util-action-15/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-13/input.pcap + args: - -k none - --simulate-ips diff --git a/tests/util-action-tests/util-action-16/input.pcap b/tests/util-action-tests/util-action-16/input.pcap deleted file mode 100644 index 95dd0d89a..000000000 Binary files a/tests/util-action-tests/util-action-16/input.pcap and /dev/null differ diff --git a/tests/util-action-tests/util-action-16/test.yaml b/tests/util-action-tests/util-action-16/test.yaml index a012c193b..370cacafd 100644 --- a/tests/util-action-tests/util-action-16/test.yaml +++ b/tests/util-action-tests/util-action-16/test.yaml @@ -1,3 +1,5 @@ +pcap: ../../util-action-tests/util-action-13/input.pcap + args: - -k none - --simulate-ips