dns-single-request: v2 and v3 tests

diff --git a/tests/dns-single-request/README.md b/tests/dns/dns-single-request/README.md
similarity index 100%
rename from tests/dns-single-request/README.md
rename to tests/dns/dns-single-request/README.md

diff --git a/tests/dns-single-request/suricata.yaml b/tests/dns/dns-single-request/suricata.yaml
similarity index 100%
rename from tests/dns-single-request/suricata.yaml
rename to tests/dns/dns-single-request/suricata.yaml

diff --git a/tests/dns/dns-single-request/test.yaml b/tests/dns/dns-single-request/test.yaml
new file mode 100644 (file)
index 0000000..0078384
--- /dev/null
+++ b/tests/dns/dns-single-request/test.yaml
@@ -0,0 +1,14 @@
+pcap: ../../dns-single-request-v1/input.pcap
+
+requires:
+  min-version: 8
+
+checks:
+  - filter:
+      count: 1
+      match:
+        dns.type: request
+  - filter:
+      count: 1
+      match:
+        dns.type: response

diff --git a/tests/dns/v2/dns-single-request/README.md b/tests/dns/v2/dns-single-request/README.md
new file mode 100644 (file)
index 0000000..29dacb2
--- /dev/null
+++ b/tests/dns/v2/dns-single-request/README.md
@@ -0,0 +1 @@
+Check a simple DNS request and response.

diff --git a/tests/dns/v2/dns-single-request/suricata.yaml b/tests/dns/v2/dns-single-request/suricata.yaml
new file mode 100644 (file)
index 0000000..4db348a
--- /dev/null
+++ b/tests/dns/v2/dns-single-request/suricata.yaml
@@ -0,0 +1,10 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 2

diff --git a/tests/dns-single-request/test.yaml b/tests/dns/v2/dns-single-request/test.yaml
similarity index 61%
rename from tests/dns-single-request/test.yaml
rename to tests/dns/v2/dns-single-request/test.yaml
index a3a2cde7ff12df708e2488f5eecf3920649e79c1..56b3a81bb7a304914e9222ef1d9f2b2dd0c0681c 100644 (file)
--- a/tests/dns-single-request/test.yaml
+++ b/tests/dns/v2/dns-single-request/test.yaml
@@ -1,8 +1,4 @@
-pcap: ../dns-single-request-v1/input.pcap
-
-requires:
-  features:
-    - HAVE_LIBJANSSON
+pcap: ../../../dns-single-request-v1/input.pcap
 
 checks:
   - filter: