From 82bc32f307f4aaf1275dabbc54b598f0cf3835a4 Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Thu, 27 Jan 2022 14:04:57 -0500 Subject: [PATCH] test/class: Fix errant classification.config ref This commit supplies a classification.config file for the empty rule test as this is required with -T (test mode) validation. --- tests/issue-4407/test.yaml | 2 +- tests/reference-config-validate-01/test.yaml | 2 +- tests/test-config-empty-rule-file/test.yaml | 4 ++-- tests/threshold-config-validate-01/test.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/issue-4407/test.yaml b/tests/issue-4407/test.yaml index effcdccbd..3d5a86b92 100644 --- a/tests/issue-4407/test.yaml +++ b/tests/issue-4407/test.yaml @@ -2,6 +2,6 @@ requires: min-version: 7 command: | - ${SRCDIR}/src/suricata --set reference-config-file="${SRCDIR}/etc/reference.config" --set threshold-file="${TEST_DIR}/threshold.config" -l ${OUTPUT_DIR} -c ${TEST_DIR}/suricata.yaml -S ${TEST_DIR}/input.rules -T + ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/etc/classification.config" --set reference-config-file="${SRCDIR}/etc/reference.config" --set threshold-file="${TEST_DIR}/threshold.config" -l ${OUTPUT_DIR} -c ${TEST_DIR}/suricata.yaml -S ${TEST_DIR}/input.rules -T exit-code: 0 diff --git a/tests/reference-config-validate-01/test.yaml b/tests/reference-config-validate-01/test.yaml index 635740ee0..29f0734ee 100644 --- a/tests/reference-config-validate-01/test.yaml +++ b/tests/reference-config-validate-01/test.yaml @@ -2,7 +2,7 @@ requires: min-version: 7 command: | - ${SRCDIR}/src/suricata --set reference-config-file="${TEST_DIR}/reference.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -T + ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/etc/classification.config" --set reference-config-file="${TEST_DIR}/reference.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -T exit-code: 1 diff --git a/tests/test-config-empty-rule-file/test.yaml b/tests/test-config-empty-rule-file/test.yaml index 999ce53d7..6ae6fd27f 100644 --- a/tests/test-config-empty-rule-file/test.yaml +++ b/tests/test-config-empty-rule-file/test.yaml @@ -6,5 +6,5 @@ requires: command: | ${SRCDIR}/src/suricata -T -c ${TEST_DIR}/suricata.yaml -vvv \ -l ${OUTPUT_DIR} --set default-rule-path="${TEST_DIR}" \ - --set reference-config-file="${SRCDIR}/etc/reference.config" - + --set reference-config-file="${SRCDIR}/etc/reference.config" \ + --set classification-file="${SRCDIR}/etc/classification.config" diff --git a/tests/threshold-config-validate-01/test.yaml b/tests/threshold-config-validate-01/test.yaml index abed67e88..fc09e42f7 100644 --- a/tests/threshold-config-validate-01/test.yaml +++ b/tests/threshold-config-validate-01/test.yaml @@ -2,7 +2,7 @@ requires: min-version: 7 command: | - ${SRCDIR}/src/suricata --set reference-config-file="${SRCDIR}/etc/reference.config" --set threshold-file="${TEST_DIR}/threshold.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -T + ${SRCDIR}/src/suricata --set classification-file="${SRCDIR}/etc/classification.config" --set reference-config-file="${SRCDIR}/etc/reference.config" --set threshold-file="${TEST_DIR}/threshold.config" -l ${OUTPUT_DIR} -c ${SRCDIR}/suricata.yaml -S ${TEST_DIR}/test.rules -T exit-code: 1 -- 2.47.2