kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e2e: Don't manually "docker kill" 

It happens automatically on test cleanup
This commit is contained in:
Tim Hockin 2022-06-14 11:52:20 -07:00
parent a4b3b3ff08
commit 9af6b7cfe2
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test_e2e.sh
View File

@ -1066,12 +1066,12 @@ function e2e::askpass_url() {
--root="$ROOT" \ --root="$ROOT" \
--link="link" \ --link="link" \
>> "$1" 2>&1 || true >> "$1" 2>&1 || true
docker_kill "$CTR"
# check for failure # check for failure
assert_file_absent "$ROOT"/link/file assert_file_absent "$ROOT"/link/file
# run with askpass_url service with correct password # run with askpass_url service with correct password
docker_kill "$CTR"
CTR=$(docker_run \ CTR=$(docker_run \
e2e/test/test-ncsvr \ e2e/test/test-ncsvr \
80 'echo -e "HTTP/1.1 200 OK\r\n\r\nusername=my-username\npassword=my-password"') 80 'echo -e "HTTP/1.1 200 OK\r\n\r\nusername=my-username\npassword=my-password"')
@ -1087,7 +1087,6 @@ function e2e::askpass_url() {
--root="$ROOT" \ --root="$ROOT" \
--link="link" \ --link="link" \
>> "$1" 2>&1 >> "$1" 2>&1
docker_kill "$CTR"
assert_link_exists "$ROOT"/link assert_link_exists "$ROOT"/link
assert_file_exists "$ROOT"/link/file assert_file_exists "$ROOT"/link/file
assert_file_eq "$ROOT"/link/file "$FUNCNAME 1" assert_file_eq "$ROOT"/link/file "$FUNCNAME 1"
@ -1263,7 +1262,6 @@ function e2e::webhook_success() {
if [[ "$HITS" < 1 ]]; then if [[ "$HITS" < 1 ]]; then
fail "webhook 2 called $HITS times" fail "webhook 2 called $HITS times"
fi fi
docker_kill "$CTR"
} }
############################################## ##############################################
@ -1298,9 +1296,9 @@ function e2e::webhook_fail_retry() {
if [[ "$HITS" < 1 ]]; then if [[ "$HITS" < 1 ]]; then
fail "webhook 1 called $HITS times" fail "webhook 1 called $HITS times"
fi fi
docker_kill "$CTR"
# Now return 200, ensure that it gets called # Now return 200, ensure that it gets called
docker_kill "$CTR"
cat /dev/null > "$HITLOG" cat /dev/null > "$HITLOG"
CTR=$(docker_run \ CTR=$(docker_run \
--ip="$IP" \ --ip="$IP" \
@ -1312,7 +1310,6 @@ function e2e::webhook_fail_retry() {
if [[ "$HITS" < 1 ]]; then if [[ "$HITS" < 1 ]]; then
fail "webhook 2 called $HITS times" fail "webhook 2 called $HITS times"
fi fi
docker_kill "$CTR"
} }
############################################## ##############################################
@ -1348,8 +1345,6 @@ function e2e::webhook_success_once() {
if [[ "$HITS" != 1 ]]; then if [[ "$HITS" != 1 ]]; then
fail "webhook called $HITS times" fail "webhook called $HITS times"
fi fi
docker_kill "$CTR"
} }
############################################## ##############################################
@ -1385,7 +1380,6 @@ function e2e::webhook_fail_retry_once() {
if [[ "$HITS" != 1 ]]; then if [[ "$HITS" != 1 ]]; then
fail "webhook called $HITS times" fail "webhook called $HITS times"
fi fi
docker_kill "$CTR"
} }
############################################## ##############################################
@ -1421,7 +1415,6 @@ function e2e::webhook_fire_and_forget() {
if [[ "$HITS" < 1 ]]; then if [[ "$HITS" < 1 ]]; then
fail "webhook called $HITS times" fail "webhook called $HITS times"
fi fi
docker_kill "$CTR"
} }
############################################## ##############################################