From 1467aaea744d4150e441c73dc83fb97fa8cb97ff Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 31 Jul 2023 12:27:23 -0400 Subject: [PATCH] tests: fix issue where networks weren't being torn down during testing Due to how the variable was assigned, there were cases where the network was specified twice with a := as a delimiter. This would result in no network being removed. --- tests/unit/test_helper.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash index 3cc86a6c0..4e6dedb6f 100644 --- a/tests/unit/test_helper.bash +++ b/tests/unit/test_helper.bash @@ -554,42 +554,42 @@ add_requirements_txt() { } create_network() { - local NETWORK_NAME="$1:=$TEST_NETWORK" + local NETWORK_NAME="${1:-$TEST_NETWORK}" NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") [[ -z "$NETWORK" ]] && docker network create "$NETWORK_NAME" } attach_network() { - local NETWORK_NAME="$1:=$TEST_NETWORK" + local NETWORK_NAME="${1:-$TEST_NETWORK}" NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") [[ -n "$NETWORK" ]] && docker network connect "$NETWORK_NAME" "${TEST_APP}.web.1" } create_attach_network() { - local NETWORK_NAME="$1:=$TEST_NETWORK" + local NETWORK_NAME="${1:-$TEST_NETWORK}" create_network "$NETWORK_NAME" attach_network "$NETWORK_NAME" } delete_network() { - local NETWORK_NAME="$1:=$TEST_NETWORK" + local NETWORK_NAME="${1:-$TEST_NETWORK}" NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") [[ -n "$NETWORK" ]] && docker network rm "$NETWORK_NAME" } detach_network() { - local NETWORK_NAME="$1:=$TEST_NETWORK" + local NETWORK_NAME="${1:-$TEST_NETWORK}" NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") [[ -z "$NETWORK" ]] && docker network disconnect "$NETWORK_NAME" "${TEST_APP}.web.1" } detach_delete_network() { - local NETWORK_NAME="$1:=$TEST_NETWORK" + local NETWORK_NAME="${1:-$TEST_NETWORK}" detach_network "$NETWORK_NAME" delete_network "$NETWORK_NAME"