Skip to content

Commit fec2c78

Browse files
committed
chore: remove wait-for-it.sh script in favour of a simpler nc test for rabbitmq listener
1 parent feded15 commit fec2c78

File tree

2 files changed

+22
-191
lines changed

2 files changed

+22
-191
lines changed

scripts/test

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,34 @@
11
#!/bin/bash
22

3+
set -e
4+
35
DIRNAME="$(dirname "$(readlink -f "$0")")"
46

57
trap rm_containters EXIT
68

79
rm_containters() {
8-
docker kill rabbitmq >/dev/null 2>&1
9-
docker kill rabbitmq-dump-queue-test >/dev/null 2>&1
10+
docker kill rdq-rabbitmq >/dev/null 2>&1
11+
docker kill rdq-busybox >/dev/null 2>&1
12+
docker kill rdq-test >/dev/null 2>&1
1013
}
1114

1215
# build docker image
13-
docker buildx build -t rabbitmq-dump-queue:test --target test .
16+
"${DIRNAME}/build_container" --target test \
17+
>/dev/null 2>&1
18+
19+
echo -e "[\033[34mINFO\033[0m] Start rabbitmq container"
20+
docker run --network=host --rm -q \
21+
--detach \
22+
--name rdq-rabbitmq \
23+
rabbitmq:4-management >/dev/null
1424

15-
# prepare rabbitmq test container
16-
docker run -d --name rabbitmq --network=host --rm rabbitmq:4-management
17-
# wait for it
18-
"${DIRNAME}/wait-for-it.sh" -h localhost -p 5672 -t 20
25+
echo -e "[\033[34mINFO\033[0m] Wait for rabbitmq listener"
26+
docker run --network=host --rm -q \
27+
--name rdq-busybox \
28+
busybox \
29+
sh -c 'nc -w 20 -z localhost 5672 >/dev/null'
1930

20-
# run tests from within test container
21-
docker run -it --name rabbitmq-dump-queue-test --network=host --rm rabbitmq-dump-queue:test
31+
echo -e "[\033[34mINFO\033[0m] Run tests"
32+
docker run --network=host --rm \
33+
--name rdq-test\
34+
rabbitmq-dump-queue:test

scripts/wait-for-it.sh

Lines changed: 0 additions & 182 deletions
This file was deleted.

0 commit comments

Comments
 (0)