Skip to content

Commit

Permalink
tests: move pcaps to tests where they are used
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@catenacyber @victorjulien
catenacyber authored and victorjulien committed Sep 19, 2024
1 parent c9d8b08 commit db01d56
Show file tree
Hide file tree
Showing 26 changed files with 12 additions and 26 deletions.
0 ...-t-version-6-init-errors-fatal/empty.pcap → ...-t-version-7-init-errors-fatal/empty.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/content-incomplete-hex-t-version-7-init-errors-fatal/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
pcap: ../content-incomplete-hex-t-version-6-init-errors-fatal/empty.pcap

requires:
min-version: 7

Expand Down
0 tests/decode-vntag-03/input.pcap → tests/decode-vntag-01/input.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/decode-vntag-01/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
pcap: ../decode-vntag-03/input.pcap

requires:

min-version: 7
Expand Down
2 changes: 1 addition & 1 deletion tests/decode-vntag-02/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pcap: ../decode-vntag-03/input.pcap
pcap: ../decode-vntag-01/input.pcap

requires:

Expand Down
0 tests/dns-single-request-v1/input.pcap → tests/dns/dns-single-request/input.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/dns/dns-single-request/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
pcap: ../../dns-single-request-v1/input.pcap

requires:
min-version: 8

Expand Down
0 tests/dns-tcp-www-google-com-v1/dns.pcap → tests/dns/dns-tcp-www-google-com/dns.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/dns/dns-tcp-www-google-com/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
requires:
min-version: 8

pcap: ../../dns-tcp-www-google-com-v1/dns.pcap

checks:
- filter:
count: 1
Expand Down
0 ...e-v1/dns-udp-double-request-response.pcap → ...onse/dns-udp-double-request-response.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/dns/dns-udp-double-request-response/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
pcap: ../../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap

requires:
min-version: 8

Expand Down
2 changes: 1 addition & 1 deletion tests/dns/dns-udp-eve-log-aaaa-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...only-v1/dns-udp-google.com-a-aaaa-mx.pcap → ...er-only/dns-udp-google.com-a-aaaa-mx.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/dns/dns-udp-eve-log-answer-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/dns-udp-eve-log-mx-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/dns-udp-eve-log-query-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
0 ...olicited-response-v1/dns-response-2x.pcap → ...unsolicited-response/dns-response-2x.pcap
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions tests/dns/dns-udp-unsolicited-response/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
requires:
min-version: 8

pcap: ../../dns-udp-unsolicited-response-v1/dns-response-2x.pcap

checks:
- filter:
count: 1
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-single-request/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pcap: ../../../dns-single-request-v1/input.pcap
pcap: ../../../dns/dns-single-request/input.pcap

checks:
- filter:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-tcp-www-google-com/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pcap: ../../../dns-tcp-www-google-com-v1/dns.pcap
pcap: ../../../dns/dns-tcp-www-google-com/dns.pcap

checks:
- filter:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-udp-double-request-response/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-udp-eve-log-aaaa-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-udp-eve-log-answer-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-udp-eve-log-mx-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-udp-eve-log-query-only/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/dns/v2/dns-udp-unsolicited-response/test.yaml
View file
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit db01d56

Please sign in to comment.