From b2d33db3d954f93ea20371559c213377b681908f Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Thu, 25 Aug 2022 16:37:15 +0200
Subject: [PATCH] btest: Remove unnecessary loading of frameworks/dpd

These tests do not test conn.log or dpd.log, so they don't actually
need to @load dpd - dynamic-protocol-detection is enabled anyway.
---
 .../btest/scripts/base/frameworks/config/container-options.zeek  | 1 -
 .../btest/scripts/base/protocols/http/http-dpd-large-req.zeek    | 1 -
 testing/btest/scripts/base/protocols/imap/capabilities.test      | 1 -
 testing/btest/scripts/base/protocols/ssl/dpd.test                | 1 -
 testing/btest/scripts/base/protocols/xmpp/client-dpd.test        | 1 -
 .../btest/scripts/base/protocols/xmpp/server-dialback-dpd.test   | 1 -
 6 files changed, 6 deletions(-)

diff --git a/testing/btest/scripts/base/frameworks/config/container-options.zeek b/testing/btest/scripts/base/frameworks/config/container-options.zeek
index cf81b5dfa7..0b386f9d86 100644
--- a/testing/btest/scripts/base/frameworks/config/container-options.zeek
+++ b/testing/btest/scripts/base/frameworks/config/container-options.zeek
@@ -2,7 +2,6 @@
 # @TEST-EXEC: btest-diff out
 
 @load base/frameworks/config
-@load base/frameworks/dpd
 
 type Color: enum { RED, GREEN, BLUE };
 
diff --git a/testing/btest/scripts/base/protocols/http/http-dpd-large-req.zeek b/testing/btest/scripts/base/protocols/http/http-dpd-large-req.zeek
index 9d1ddc33e2..557fe29d29 100644
--- a/testing/btest/scripts/base/protocols/http/http-dpd-large-req.zeek
+++ b/testing/btest/scripts/base/protocols/http/http-dpd-large-req.zeek
@@ -5,7 +5,6 @@
 
 @load base/protocols/conn
 @load base/protocols/http
-@load base/frameworks/dpd
 
 event http_request(c: connection, method: string, original_URI: string, unescaped_URI: string, version: string)
 	{
diff --git a/testing/btest/scripts/base/protocols/imap/capabilities.test b/testing/btest/scripts/base/protocols/imap/capabilities.test
index 81fb802275..61f5812b02 100644
--- a/testing/btest/scripts/base/protocols/imap/capabilities.test
+++ b/testing/btest/scripts/base/protocols/imap/capabilities.test
@@ -3,7 +3,6 @@
 
 @load base/protocols/ssl
 @load base/protocols/conn
-@load base/frameworks/dpd
 @load base/protocols/imap
 
 event imap_capabilities(c: connection, capabilities: string_vec)
diff --git a/testing/btest/scripts/base/protocols/ssl/dpd.test b/testing/btest/scripts/base/protocols/ssl/dpd.test
index 4a23aeb0d2..b11b9bb48a 100644
--- a/testing/btest/scripts/base/protocols/ssl/dpd.test
+++ b/testing/btest/scripts/base/protocols/ssl/dpd.test
@@ -5,7 +5,6 @@
 # @TEST-EXEC: zeek -b -r $TRACES/tls/tls-13draft19-early-data.pcap %INPUT
 # @TEST-EXEC: btest-diff .stdout
 
-@load base/frameworks/dpd
 @load base/frameworks/signatures
 @load-sigs base/protocols/ssl/dpd.sig
 @load-sigs policy/protocols/ssl/dpd-v2.sig
diff --git a/testing/btest/scripts/base/protocols/xmpp/client-dpd.test b/testing/btest/scripts/base/protocols/xmpp/client-dpd.test
index 544b56a744..b89732a23e 100644
--- a/testing/btest/scripts/base/protocols/xmpp/client-dpd.test
+++ b/testing/btest/scripts/base/protocols/xmpp/client-dpd.test
@@ -1,7 +1,6 @@
 # @TEST-EXEC: zeek -C -b -r $TRACES/tls/xmpp-starttls.pcap %INPUT
 # @TEST-EXEC: btest-diff ssl.log
 
-@load base/frameworks/dpd
 @load base/frameworks/signatures
 @load base/protocols/ssl
 @load base/protocols/conn
diff --git a/testing/btest/scripts/base/protocols/xmpp/server-dialback-dpd.test b/testing/btest/scripts/base/protocols/xmpp/server-dialback-dpd.test
index e398aed22e..7b55ba8f55 100644
--- a/testing/btest/scripts/base/protocols/xmpp/server-dialback-dpd.test
+++ b/testing/btest/scripts/base/protocols/xmpp/server-dialback-dpd.test
@@ -1,7 +1,6 @@
 # @TEST-EXEC: zeek -C -b -r $TRACES/tls/xmpp-dialback-starttls.pcap %INPUT
 # @TEST-EXEC: btest-diff ssl.log
 
-@load base/frameworks/dpd
 @load base/frameworks/signatures
 @load base/protocols/ssl
 @load base/protocols/conn