From: Jason Ish Date: Tue, 1 May 2018 16:44:18 +0000 (-0600) Subject: filestore tests: remove included Suricata X-Git-Tag: suricata-6.0.4~490 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13cf3c73ffd176038298841979eb4ec244bd52ec;p=thirdparty%2Fsuricata-verify.git filestore tests: remove included Suricata Per Victor's observation that the suricata.yaml can be almost empty. --- diff --git a/tests/filestore-v2.1-forced/suricata.yaml b/tests/filestore-v2.1-forced/suricata.yaml index 4d28bb659..22e3e3556 100644 --- a/tests/filestore-v2.1-forced/suricata.yaml +++ b/tests/filestore-v2.1-forced/suricata.yaml @@ -1,8 +1,6 @@ %YAML 1.1 --- -include: ../../etc/suricata-4.0.3.yaml - outputs: - eve-log: enabled: yes diff --git a/tests/filestore-v2.2-forced-with-open-files/suricata.yaml b/tests/filestore-v2.2-forced-with-open-files/suricata.yaml index d6e80d7e6..94a74ecba 100644 --- a/tests/filestore-v2.2-forced-with-open-files/suricata.yaml +++ b/tests/filestore-v2.2-forced-with-open-files/suricata.yaml @@ -1,8 +1,6 @@ %YAML 1.1 --- -include: ../../etc/suricata-4.0.3.yaml - outputs: - eve-log: enabled: yes diff --git a/tests/filestore-v2.3-fserror/suricata.yaml b/tests/filestore-v2.3-fserror/suricata.yaml index 4d28bb659..22e3e3556 100644 --- a/tests/filestore-v2.3-fserror/suricata.yaml +++ b/tests/filestore-v2.3-fserror/suricata.yaml @@ -1,8 +1,6 @@ %YAML 1.1 --- -include: ../../etc/suricata-4.0.3.yaml - outputs: - eve-log: enabled: yes diff --git a/tests/filestore-v2.4-forced-with-meta/suricata.yaml b/tests/filestore-v2.4-forced-with-meta/suricata.yaml index 090d7c9fa..a0b85befb 100644 --- a/tests/filestore-v2.4-forced-with-meta/suricata.yaml +++ b/tests/filestore-v2.4-forced-with-meta/suricata.yaml @@ -1,8 +1,6 @@ %YAML 1.1 --- -include: ../../etc/suricata-4.0.3.yaml - outputs: - eve-log: enabled: yes diff --git a/tests/filestore-v2.5-both-enabled/suricata.yaml b/tests/filestore-v2.5-both-enabled/suricata.yaml index b935c8ce7..21b6f92a3 100644 --- a/tests/filestore-v2.5-both-enabled/suricata.yaml +++ b/tests/filestore-v2.5-both-enabled/suricata.yaml @@ -1,8 +1,6 @@ %YAML 1.1 --- -include: ../../etc/suricata-4.0.3.yaml - outputs: - file-store: version: 2