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

Merge pull request #538 from thockin/v4-dont-docker-kill 

v4: e2e: Don't manually "docker kill"
This commit is contained in:
Kubernetes Prow Robot 2022-07-02 12:59:24 -07:00 committed by GitHub
parent 587af4d522 9af6b7cfe2
commit 58bb41e82f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -1079,12 +1079,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 ' 80 '
@ -1105,7 +1105,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"
@ -1281,7 +1280,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"
} }
############################################## ##############################################
@ -1316,9 +1314,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" \
@ -1330,7 +1328,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"
} }
############################################## ##############################################
@ -1366,8 +1363,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"
} }
############################################## ##############################################
@ -1403,7 +1398,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"
} }
############################################## ##############################################
@ -1439,7 +1433,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"
} }
############################################## ##############################################