From ee58cb57850e58a3b9e49a85c2f497fae97a1723 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Wed, 29 Sep 2021 13:57:42 -0700
Subject: [PATCH] Add Python Broker module load test to Docker image btests

We missed the fact that the broker module didn't load due to a wrong libpython
version because we didn't test that load.

Also remove an unused environment variable from btest.cfg.
---
 docker/btest/btest.cfg                 | 1 -
 docker/btest/docker/structure_tests.sh | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/btest/btest.cfg b/docker/btest/btest.cfg
index 69b30b9184..bf1b17fec7 100644
--- a/docker/btest/btest.cfg
+++ b/docker/btest/btest.cfg
@@ -9,5 +9,4 @@ MinVersion  = 0.63
 [environment]
 LC_ALL=C
 PATH=%(testbase)s/../../auxil/btest:%(default_path)s
-TEST_IMAGE=${TEST_TAG:-zeek:latest}
 TZ=UTC
diff --git a/docker/btest/docker/structure_tests.sh b/docker/btest/docker/structure_tests.sh
index cb6cd2e6f0..ba20fec05a 100644
--- a/docker/btest/docker/structure_tests.sh
+++ b/docker/btest/docker/structure_tests.sh
@@ -18,3 +18,6 @@ docker run --rm "${TEST_TAG}" zkg config
 
 # Check that a plugin can be installed. We pick any plugin with minimal deps here.
 docker run --rm "${TEST_TAG}" zkg install --force sethhall/domain-tld | sed 's/(.*)/(XXX)/'
+
+# Check that the Broker Python module loads
+docker run --rm "${TEST_TAG}" python3 -c "import broker"