tests: move pcaps to tests where they are used

Following removal of tests only used in 6, some directories
were left with only a pcap, that got used by other tests.

Found with command
for pcap in $(find . -name *.pcap); do if ! test -e "$(dirname $pcap)/test.yaml"; then echo "$(dirname $pcap)"; fi; done

diff --git a/tests/content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap b/tests/content-incomplete-hex-t-version-7-init-errors-fatal/empty.pcap
similarity index 100%
rename from tests/content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap
rename to tests/content-incomplete-hex-t-version-7-init-errors-fatal/empty.pcap

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 8bd980fb37404358ee12549a0af54689c2f290c8..85764cb5a5ec8ea61787227093995172a39c705a 100644 (file)
--- 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,5 +1,3 @@
-pcap: ../content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap
-
 requires:
   min-version: 7
 

diff --git a/tests/decode-vntag-03/input.pcap b/tests/decode-vntag-01/input.pcap
similarity index 100%
rename from tests/decode-vntag-03/input.pcap
rename to tests/decode-vntag-01/input.pcap

diff --git a/tests/decode-vntag-01/test.yaml b/tests/decode-vntag-01/test.yaml
index 627ec0d26b4c165a15b693518a368ef00eeae77a..199d4488fe039ad5aa4c2918c52ecb6592a066ef 100644 (file)
--- a/tests/decode-vntag-01/test.yaml
+++ b/tests/decode-vntag-01/test.yaml
@@ -1,5 +1,3 @@
-pcap: ../decode-vntag-03/input.pcap
-
 requires:
 
   min-version: 7

diff --git a/tests/decode-vntag-02/test.yaml b/tests/decode-vntag-02/test.yaml
index 6d464e56fc864690c880389a890eed3a975eade6..f241cc8556cac95d193aa661229e56f14cb1fdaa 100644 (file)
--- a/tests/decode-vntag-02/test.yaml
+++ b/tests/decode-vntag-02/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../decode-vntag-03/input.pcap
+pcap: ../decode-vntag-01/input.pcap
 
 requires:
 

diff --git a/tests/dns-single-request-v1/input.pcap b/tests/dns/dns-single-request/input.pcap
similarity index 100%
rename from tests/dns-single-request-v1/input.pcap
rename to tests/dns/dns-single-request/input.pcap

diff --git a/tests/dns/dns-single-request/test.yaml b/tests/dns/dns-single-request/test.yaml
index 0078384f2fdcb106dad07e9d555fad3385ad106e..164d81033f18eac548ea8a1008443535e1dc41fe 100644 (file)
--- a/tests/dns/dns-single-request/test.yaml
+++ b/tests/dns/dns-single-request/test.yaml
@@ -1,5 +1,3 @@
-pcap: ../../dns-single-request-v1/input.pcap
-
 requires:
   min-version: 8
 

diff --git a/tests/dns-tcp-www-google-com-v1/dns.pcap b/tests/dns/dns-tcp-www-google-com/dns.pcap
similarity index 100%
rename from tests/dns-tcp-www-google-com-v1/dns.pcap
rename to tests/dns/dns-tcp-www-google-com/dns.pcap

diff --git a/tests/dns/dns-tcp-www-google-com/test.yaml b/tests/dns/dns-tcp-www-google-com/test.yaml
index 6f7575459bed5a4e0e919ae5e32b9baac27d62a5..5d4de94ca83379db0c62381efe0b2be45d86c1e7 100644 (file)
--- a/tests/dns/dns-tcp-www-google-com/test.yaml
+++ b/tests/dns/dns-tcp-www-google-com/test.yaml
@@ -1,8 +1,6 @@
 requires:
   min-version: 8
 
-pcap: ../../dns-tcp-www-google-com-v1/dns.pcap
-
 checks:
   - filter:
       count: 1

diff --git a/tests/dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap b/tests/dns/dns-udp-double-request-response/dns-udp-double-request-response.pcap
similarity index 100%
rename from tests/dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap
rename to tests/dns/dns-udp-double-request-response/dns-udp-double-request-response.pcap

diff --git a/tests/dns/dns-udp-double-request-response/test.yaml b/tests/dns/dns-udp-double-request-response/test.yaml
index 639a6364f14c2643881032ce9a3afea8363a1fbe..5f208b737612f3b9ecd3d220bf6ac3dbbc227dfb 100644 (file)
--- a/tests/dns/dns-udp-double-request-response/test.yaml
+++ b/tests/dns/dns-udp-double-request-response/test.yaml
@@ -1,5 +1,3 @@
-pcap: ../../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap
-
 requires:
   min-version: 8
 

diff --git a/tests/dns/dns-udp-eve-log-aaaa-only/test.yaml b/tests/dns/dns-udp-eve-log-aaaa-only/test.yaml
index 4acf17876678b7d0c51a6deadd4b20c85699e8b6..93c1342dbe7a4cc98e2c2cf655605b38eedbb88c 100644 (file)
--- a/tests/dns/dns-udp-eve-log-aaaa-only/test.yaml
+++ b/tests/dns/dns-udp-eve-log-aaaa-only/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 requires:
   min-version: 8

diff --git a/tests/dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap b/tests/dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
similarity index 100%
rename from tests/dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
rename to tests/dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap

diff --git a/tests/dns/dns-udp-eve-log-answer-only/test.yaml b/tests/dns/dns-udp-eve-log-answer-only/test.yaml
index d55921072160fe883d53e82907e2be638c457382..079cce8f26cb2b62adfb3e13a2307d841f20fa25 100644 (file)
--- a/tests/dns/dns-udp-eve-log-answer-only/test.yaml
+++ b/tests/dns/dns-udp-eve-log-answer-only/test.yaml
@@ -1,8 +1,6 @@
 requires:
   min-version: 8
 
-pcap: ../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
-
 checks:
   - filter:
       count: 0

diff --git a/tests/dns/dns-udp-eve-log-mx-only/test.yaml b/tests/dns/dns-udp-eve-log-mx-only/test.yaml
index 00b337b83bb9a91abe3e41a31a78623357d7d8c9..649405a9b1e9302e233b240133f532c0d2b89a89 100644 (file)
--- a/tests/dns/dns-udp-eve-log-mx-only/test.yaml
+++ b/tests/dns/dns-udp-eve-log-mx-only/test.yaml
@@ -1,7 +1,7 @@
 requires:
   min-version: 8
 
-pcap: ../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/dns-udp-eve-log-query-only/test.yaml b/tests/dns/dns-udp-eve-log-query-only/test.yaml
index b9c1c8d94375e51509bc40d0dcb465ef1835995d..1e401fdf8660d71560d197f1d9b39164ed814595 100644 (file)
--- a/tests/dns/dns-udp-eve-log-query-only/test.yaml
+++ b/tests/dns/dns-udp-eve-log-query-only/test.yaml
@@ -1,7 +1,7 @@
 requires:
   min-version: 8
 
-pcap: ../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 checks:
   - filter:

diff --git a/tests/dns-udp-unsolicited-response-v1/dns-response-2x.pcap b/tests/dns/dns-udp-unsolicited-response/dns-response-2x.pcap
similarity index 100%
rename from tests/dns-udp-unsolicited-response-v1/dns-response-2x.pcap
rename to tests/dns/dns-udp-unsolicited-response/dns-response-2x.pcap

diff --git a/tests/dns/dns-udp-unsolicited-response/test.yaml b/tests/dns/dns-udp-unsolicited-response/test.yaml
index 3f857b39bc0d17af416edf1c18ed1969b759c54c..22345ad0f640da463e271aa5299312a9f1cc4872 100644 (file)
--- a/tests/dns/dns-udp-unsolicited-response/test.yaml
+++ b/tests/dns/dns-udp-unsolicited-response/test.yaml
@@ -1,8 +1,6 @@
 requires:
   min-version: 8
 
-pcap: ../../dns-udp-unsolicited-response-v1/dns-response-2x.pcap
-
 checks:
   - filter:
       count: 1

diff --git a/tests/dns/v2/dns-single-request/test.yaml b/tests/dns/v2/dns-single-request/test.yaml
index 56b3a81bb7a304914e9222ef1d9f2b2dd0c0681c..7e1933eab064b07b8199e3536fd45532a21343ef 100644 (file)
--- a/tests/dns/v2/dns-single-request/test.yaml
+++ b/tests/dns/v2/dns-single-request/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-single-request-v1/input.pcap
+pcap: ../../../dns/dns-single-request/input.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/v2/dns-tcp-www-google-com/test.yaml b/tests/dns/v2/dns-tcp-www-google-com/test.yaml
index b9331008e6fbce4c03135eeef5a5b4258bf8e370..e4ad8fe5f079855b5c675ba4ee63fc273b0a1f62 100644 (file)
--- a/tests/dns/v2/dns-tcp-www-google-com/test.yaml
+++ b/tests/dns/v2/dns-tcp-www-google-com/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-tcp-www-google-com-v1/dns.pcap
+pcap: ../../../dns/dns-tcp-www-google-com/dns.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/v2/dns-udp-double-request-response/test.yaml b/tests/dns/v2/dns-udp-double-request-response/test.yaml
index 25311ee3b09cbe699a23881b98d3a385eb13ffb5..15c40bac6c188086dfeb10548fa630debe1adde7 100644 (file)
--- a/tests/dns/v2/dns-udp-double-request-response/test.yaml
+++ b/tests/dns/v2/dns-udp-double-request-response/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap
+pcap: ../../../dns/dns-udp-double-request-response/dns-udp-double-request-response.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/v2/dns-udp-eve-log-aaaa-only/test.yaml b/tests/dns/v2/dns-udp-eve-log-aaaa-only/test.yaml
index 4b4c8c7844eea536125c3f95e272faa7ecbebdf7..f9a9ebbafa2bb5f73a5ce9ff7f9d8a23d82eed59 100644 (file)
--- a/tests/dns/v2/dns-udp-eve-log-aaaa-only/test.yaml
+++ b/tests/dns/v2/dns-udp-eve-log-aaaa-only/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/v2/dns-udp-eve-log-answer-only/test.yaml b/tests/dns/v2/dns-udp-eve-log-answer-only/test.yaml
index 837e3b59c549b757ddf7e6ab63501e3a2e00961a..00fd8bce8e1bf55e8aa220588c320cb6f568edd0 100644 (file)
--- a/tests/dns/v2/dns-udp-eve-log-answer-only/test.yaml
+++ b/tests/dns/v2/dns-udp-eve-log-answer-only/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/v2/dns-udp-eve-log-mx-only/test.yaml b/tests/dns/v2/dns-udp-eve-log-mx-only/test.yaml
index 94f6d0cc1e4a865c28bd8b372aa37df8c95c7db9..af5b9b7d54093629f54d7f4a203357883b3ffd9b 100644 (file)
--- a/tests/dns/v2/dns-udp-eve-log-mx-only/test.yaml
+++ b/tests/dns/v2/dns-udp-eve-log-mx-only/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 checks:
   - filter:

diff --git a/tests/dns/v2/dns-udp-eve-log-query-only/test.yaml b/tests/dns/v2/dns-udp-eve-log-query-only/test.yaml
index 09793dfb312a6a103d9c0b6d518d7fca67be7599..53229b9ca75724382db738a0343293bbdb4fc2a4 100644 (file)
--- a/tests/dns/v2/dns-udp-eve-log-query-only/test.yaml
+++ b/tests/dns/v2/dns-udp-eve-log-query-only/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-udp-eve-log-query-only-v1/dns-udp-google.com-a-aaaa-mx.pcap
+pcap: ../../../dns/dns-udp-eve-log-answer-only/dns-udp-google.com-a-aaaa-mx.pcap
 
 requires:
   features:

diff --git a/tests/dns/v2/dns-udp-unsolicited-response/test.yaml b/tests/dns/v2/dns-udp-unsolicited-response/test.yaml
index 03619f38e9d85db46ce9ddc8c0a0574f79154e0d..f273682fdb95a0405e74e23b6b520fa8734ee800 100644 (file)
--- a/tests/dns/v2/dns-udp-unsolicited-response/test.yaml
+++ b/tests/dns/v2/dns-udp-unsolicited-response/test.yaml
@@ -1,4 +1,4 @@
-pcap: ../../../dns-udp-unsolicited-response-v1/dns-response-2x.pcap
+pcap: ../../../dns/dns-udp-unsolicited-response/dns-response-2x.pcap
 
 checks:
   - filter: