From 9af6b7cfe227dc56915f9c0be4d69b0d1c5727ee Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Tue, 14 Jun 2022 11:52:20 -0700
Subject: [PATCH] e2e: Don't manually "docker kill"

It happens automatically on test cleanup
---
 test_e2e.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/test_e2e.sh b/test_e2e.sh
index d62b03b..0e92999 100755
--- a/test_e2e.sh
+++ b/test_e2e.sh
@@ -1066,12 +1066,12 @@ function e2e::askpass_url() {
         --root="$ROOT" \
         --link="link" \
         >> "$1" 2>&1 || true
-    docker_kill "$CTR"
 
     # check for failure
     assert_file_absent "$ROOT"/link/file
 
     # run with askpass_url service with correct password
+    docker_kill "$CTR"
     CTR=$(docker_run \
         e2e/test/test-ncsvr \
         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" \
         --link="link" \
         >> "$1" 2>&1
-    docker_kill "$CTR"
     assert_link_exists "$ROOT"/link
     assert_file_exists "$ROOT"/link/file
     assert_file_eq "$ROOT"/link/file "$FUNCNAME 1"
@@ -1263,7 +1262,6 @@ function e2e::webhook_success() {
     if [[ "$HITS" < 1 ]]; then
         fail "webhook 2 called $HITS times"
     fi
-    docker_kill "$CTR"
 }
 
 ##############################################
@@ -1298,9 +1296,9 @@ function e2e::webhook_fail_retry() {
     if [[ "$HITS" < 1 ]]; then
         fail "webhook 1 called $HITS times"
     fi
-    docker_kill "$CTR"
 
     # Now return 200, ensure that it gets called
+    docker_kill "$CTR"
     cat /dev/null > "$HITLOG"
     CTR=$(docker_run \
         --ip="$IP" \
@@ -1312,7 +1310,6 @@ function e2e::webhook_fail_retry() {
     if [[ "$HITS" < 1 ]]; then
         fail "webhook 2 called $HITS times"
     fi
-    docker_kill "$CTR"
 }
 
 ##############################################
@@ -1348,8 +1345,6 @@ function e2e::webhook_success_once() {
     if [[ "$HITS" != 1 ]]; then
         fail "webhook called $HITS times"
     fi
-
-    docker_kill "$CTR"
 }
 
 ##############################################
@@ -1385,7 +1380,6 @@ function e2e::webhook_fail_retry_once() {
     if [[ "$HITS" != 1 ]]; then
         fail "webhook called $HITS times"
     fi
-    docker_kill "$CTR"
 }
 
 ##############################################
@@ -1421,7 +1415,6 @@ function e2e::webhook_fire_and_forget() {
     if [[ "$HITS" < 1 ]]; then
         fail "webhook called $HITS times"
     fi
-    docker_kill "$CTR"
 }
 
 ##############################################