github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

tests: fix issue where networks weren't being torn down during testing

Browse Source 
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.
This commit is contained in:
Jose Diaz-Gonzalez
2023-07-31 12:27:23 -04:00
parent 5717e71755
commit 1467aaea74
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/test_helper.bash
View File

@@ -554,42 +554,42 @@ add_requirements_txt() {
} }
create_network() { create_network() {
local NETWORK_NAME="$1:=$TEST_NETWORK" local NETWORK_NAME="${1:-$TEST_NETWORK}"
NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") NETWORK=$(docker network ls -q -f name="$NETWORK_NAME")
[[ -z "$NETWORK" ]] && docker network create "$NETWORK_NAME" [[ -z "$NETWORK" ]] && docker network create "$NETWORK_NAME"
} }
attach_network() { attach_network() {
local NETWORK_NAME="$1:=$TEST_NETWORK" local NETWORK_NAME="${1:-$TEST_NETWORK}"
NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") NETWORK=$(docker network ls -q -f name="$NETWORK_NAME")
[[ -n "$NETWORK" ]] && docker network connect "$NETWORK_NAME" "${TEST_APP}.web.1" [[ -n "$NETWORK" ]] && docker network connect "$NETWORK_NAME" "${TEST_APP}.web.1"
} }
create_attach_network() { create_attach_network() {
local NETWORK_NAME="$1:=$TEST_NETWORK" local NETWORK_NAME="${1:-$TEST_NETWORK}"
create_network "$NETWORK_NAME" create_network "$NETWORK_NAME"
attach_network "$NETWORK_NAME" attach_network "$NETWORK_NAME"
} }
delete_network() { delete_network() {
local NETWORK_NAME="$1:=$TEST_NETWORK" local NETWORK_NAME="${1:-$TEST_NETWORK}"
NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") NETWORK=$(docker network ls -q -f name="$NETWORK_NAME")
[[ -n "$NETWORK" ]] && docker network rm "$NETWORK_NAME" [[ -n "$NETWORK" ]] && docker network rm "$NETWORK_NAME"
} }
detach_network() { detach_network() {
local NETWORK_NAME="$1:=$TEST_NETWORK" local NETWORK_NAME="${1:-$TEST_NETWORK}"
NETWORK=$(docker network ls -q -f name="$NETWORK_NAME") NETWORK=$(docker network ls -q -f name="$NETWORK_NAME")
[[ -z "$NETWORK" ]] && docker network disconnect "$NETWORK_NAME" "${TEST_APP}.web.1" [[ -z "$NETWORK" ]] && docker network disconnect "$NETWORK_NAME" "${TEST_APP}.web.1"
} }
detach_delete_network() { detach_delete_network() {
local NETWORK_NAME="$1:=$TEST_NETWORK" local NETWORK_NAME="${1:-$TEST_NETWORK}"
detach_network "$NETWORK_NAME" detach_network "$NETWORK_NAME"
delete_network "$NETWORK_NAME" delete_network "$NETWORK_NAME"