Skip to content

Commit 1b3215e

Browse files
committed
Test scripts:
* Use awk to generate a random container name for Kerberos test. * Set +e in trap to avoid exiting the script if docker rm or rmi fails.
1 parent 8d231a2 commit 1b3215e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/test-scripts/krb/krb-test.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ krb5_test() {
3131
local openssl_config=$test_dir/openssl.conf
3232
local stop_file=$test_dir/stop
3333
local start_file=$test_dir/start
34-
local container_name=qfs-krb-test-$RANDOM-$RANDOM-$RANDOM-$RANDOM
3534
local log_file=$test_dir/log
3635
local krb5_realm=QFS.TEST
3736
local my_dir=$(dirname -- "$0") || return 1
@@ -76,10 +75,14 @@ EOF
7675
--target "$(basename -- "$test_program")"
7776
fi
7877

78+
local container_name=qfs-krb-test-$(
79+
awk 'BEGIN { srand(); print int(rand() * 1e10) int(rand() * 1e10); }'
80+
)
7981
# Build the test container:
8082
docker build -t "$container_name" -f "$my_dir/Dockerfile.krbtest" "$my_dir"
8183
CONTAINER_NAME=$container_name
8284
trap '
85+
set +e
8386
docker rm -v --force -- "$CONTAINER_NAME" >/dev/null 2>&1
8487
docker rmi --force -- "$CONTAINER_NAME" >/dev/null 2>&1
8588
' EXIT INT TERM QUIT HUP

0 commit comments

Comments
 (0)