Fiddling with test scripts

whyscream · Jul 5, 2024 · 9d7793e · 9d7793e
1 parent 25eb6a8
commit 9d7793e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/test_config_syntax.sh b/test_config_syntax.sh
@@ -6,11 +6,12 @@
 # The configuration file is validated using the logstash --config.test_and_exit command in a docker container.
 #
 
-set -eux
+set -eu
 
 LOGSTASH_VERSION=8.14.1
 
-docker run --rm -it \
+docker run \
+  --rm \
   --volume "$(pwd)"/postfix.grok:/etc/logstash/patterns.d/postfix.grok \
   --volume "$(pwd)"/50-filter-postfix.conf:/usr/share/logstash/pipeline/50-filter-postfix.conf \
   logstash:"$LOGSTASH_VERSION" \

diff --git a/test_grok_patterns.sh b/test_grok_patterns.sh
@@ -6,7 +6,7 @@
 # The patterns are tested by running the test suite (in test/test.rb and test/*.yaml)
 # against the patterns in the postfix.grok file in a docker container.
 #
-set -eux
+set -eu
 
 DOCKERIMAGE="postfix-grok-patterns-runtests"
 VOLUMEPATH="/runtests"
@@ -18,4 +18,9 @@ FROM ruby:slim
 RUN gem install jls-grok minitest
 EOF
 
-docker run --volume "$(pwd)":"${VOLUMEPATH}" --workdir ${VOLUMEPATH} ${DOCKERIMAGE} sh -c "ruby test/test.rb"
+docker run \
+  --rm \
+  --volume "$(pwd)":"${VOLUMEPATH}" \
+  --workdir ${VOLUMEPATH} \
+  ${DOCKERIMAGE} \
+  sh -c "ruby test/test.rb"
diff --git a/test_pipeline.sh b/test_pipeline.sh
@@ -7,14 +7,21 @@
 # sends a test logline through the pipeline and checks the results.
 #
 
-set -eux
+set -eu
 
 LOGSTASH_VERSION=8.14.1
 
 INPUT=$(mktemp tmp.logstash.in.XXXXX)
 OUTPUT=$(mktemp tmp.logstash.out.XXXXX)
 PIPELINE=$(mktemp tmp.logstash.pipeline.XXXXX)
 
+perform_cleanup() {
+  echo Cleaning up
+  test -n "CONTAINER_ID" && docker stop --time 1 "$CONTAINER_ID" > /dev/null
+  rm -f "$INPUT" "$OUTPUT" "$PIPELINE"
+}
+trap perform_cleanup INT TERM
+
 echo Preparing input data
 echo "postfix/smtp[123]: 7EE668039: to=<[email protected]>, relay=127.0.0.1[127.0.0.1]:2525, delay=3.6, delays=0.2/0.02/0.04/3.3, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as 153053D)" > "$INPUT"
 
@@ -61,8 +68,6 @@ until test -s "$OUTPUT"; do
 done
 echo
 
-docker stop --time 1 "$CONTAINER_ID" > /dev/null
-
 if test "$(jq .tags[0] "$OUTPUT")" = '"_grok_postfix_success"'; then
   echo Grok processing successful!
   jq . "$OUTPUT"
@@ -72,7 +77,6 @@ else
   exit 1
 fi
 
-echo Cleaning up
-rm -f "$INPUT" "$OUTPUT" "$PIPELINE"
+perform_cleanup
 
 echo Done