Skip to content

Commit e18f1b6

Browse files
committed
Fix gha-setup stop
It always failed to stop rabbitmq container
1 parent 9b41b13 commit e18f1b6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.ci/ubuntu/gha-setup.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ readonly script_dir
99
echo "[INFO] script_dir: '$script_dir'"
1010
readonly rabbitmq_image=${RABBITMQ_IMAGE:-rabbitmq:4.2-rc-management-alpine}
1111

12-
1312
readonly docker_name_prefix='rabbitmq-amqp-go-client'
1413
readonly docker_network_name="$docker_name_prefix-network"
1514

15+
declare -r rabbitmq_docker_name="$docker_name_prefix-rabbitmq"
16+
declare -r toxiproxy_docker_name="$docker_name_prefix-toxiproxy"
17+
1618
if [[ ! -v GITHUB_ACTIONS ]]
1719
then
1820
GITHUB_ACTIONS='false'
@@ -49,9 +51,6 @@ fi
4951

5052
set -o nounset
5153

52-
declare -r rabbitmq_docker_name="$docker_name_prefix-rabbitmq"
53-
declare -r toxiproxy_docker_name="$docker_name_prefix-toxiproxy"
54-
5554
function start_toxiproxy
5655
{
5756
if [[ $run_toxiproxy == 'true' ]]

pkg/rabbitmqamqp/amqp_connection_recovery_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ var _ = Describe("Recovery connection test", func() {
10961096
_ = conn.Close(ctx)
10971097
})
10981098

1099-
It("should recover auto-generated queues bound to persistent exchanges", func(ctx context.Context) {
1099+
It("recovers auto-gen queues", func(ctx context.Context) {
11001100
conn, err := env.NewConnection(ctx)
11011101
Expect(err).ToNot(HaveOccurred())
11021102
ch := make(chan *StateChanged, 1)

0 commit comments

Comments
 (0)