dns-tcp-multirequest-buffer: v2 and v3 tests

diff --git a/tests/dns-tcp-multirequest-buffer-v1/test.yaml b/tests/dns-tcp-multirequest-buffer-v1/test.yaml
index 637d013e4ca0fff34565b4138b359fc4728db30f..bc3f13d742e366f147bb57291455117c6fd36f4f 100644 (file)
--- a/tests/dns-tcp-multirequest-buffer-v1/test.yaml
+++ b/tests/dns-tcp-multirequest-buffer-v1/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap
+pcap: ../dns/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap
 
 requires:
   features:

diff --git a/tests/dns-tcp-multirequest-buffer/README b/tests/dns/dns-tcp-multirequest-buffer/README
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer/README
rename to tests/dns/dns-tcp-multirequest-buffer/README

diff --git a/tests/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap b/tests/dns/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap
rename to tests/dns/dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap

diff --git a/tests/dns-tcp-multirequest-buffer/suricata.yaml b/tests/dns/dns-tcp-multirequest-buffer/suricata.yaml
similarity index 100%
rename from tests/dns-tcp-multirequest-buffer/suricata.yaml
rename to tests/dns/dns-tcp-multirequest-buffer/suricata.yaml

diff --git a/tests/dns/dns-tcp-multirequest-buffer/test.yaml b/tests/dns/dns-tcp-multirequest-buffer/test.yaml
new file mode 100644 (file)
index 0000000..2e08d62
--- /dev/null
+++ b/tests/dns/dns-tcp-multirequest-buffer/test.yaml
@@ -0,0 +1,12 @@
+requires:
+  min-version: 8
+    
+checks:
+  - filter:
+      count: 20
+      match:
+        dns.type: request
+  - filter:
+      count: 20
+      match:
+        dns.type: response

diff --git a/tests/dns/v2/dns-tcp-multirequest-buffer/README b/tests/dns/v2/dns-tcp-multirequest-buffer/README
new file mode 100644 (file)
index 0000000..6ce66e4
--- /dev/null
+++ b/tests/dns/v2/dns-tcp-multirequest-buffer/README
@@ -0,0 +1,5 @@
+Test a TCP DNS request that contains multiple DNS requests in a single
+buffer.
+
+This test includes its own verification script instead of using the
+default file compare.

diff --git a/tests/dns/v2/dns-tcp-multirequest-buffer/suricata.yaml b/tests/dns/v2/dns-tcp-multirequest-buffer/suricata.yaml
new file mode 100644 (file)
index 0000000..81343fa
--- /dev/null
+++ b/tests/dns/v2/dns-tcp-multirequest-buffer/suricata.yaml
@@ -0,0 +1,8 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      types:
+        - dns:

diff --git a/tests/dns-tcp-multirequest-buffer/test.yaml b/tests/dns/v2/dns-tcp-multirequest-buffer/test.yaml
similarity index 56%
rename from tests/dns-tcp-multirequest-buffer/test.yaml
rename to tests/dns/v2/dns-tcp-multirequest-buffer/test.yaml
index 9bdb3c8b4c81f10ed095d787d18ff052f995fcc4..f05f95047713ae2a7d1fec9a64e20de8f8595d11 100644 (file)
--- a/tests/dns-tcp-multirequest-buffer/test.yaml
+++ b/tests/dns/v2/dns-tcp-multirequest-buffer/test.yaml
@@ -1,7 +1,8 @@
-requires:
-  features:
-    - HAVE_LIBJANSSON
+pcap: ../../dns-tcp-multirequest-buffer/dns-tcp-multirequest-buffer.pcap
     
+env:
+  SURICATA_EVE_DNS_VERSION: 2
+
 checks:
   - filter:
       count: 20