Merge pull request #18043 from vrothberg/fix-18041

test updates to help debug #18041
containers · Apr 6, 2023 · b39cdff · b39cdff
2 parents 4880f63 + cb7b8fb
commit b39cdff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
@@ -895,7 +895,6 @@ func extractTarFile(r *http.Request) (string, error) {
 
 	// Content-Length not used as too many existing API clients didn't honor it
 	_, err = io.Copy(tarBall, r.Body)
-	r.Body.Close()
 	if err != nil {
 		return "", fmt.Errorf("failed Request: Unable to copy tar file from request body %s", r.RequestURI)
 	}

diff --git a/pkg/api/handlers/libpod/kube.go b/pkg/api/handlers/libpod/kube.go
@@ -108,7 +108,6 @@ func KubePlay(w http.ResponseWriter, r *http.Request) {
 		options.Start = types.NewOptionalBool(query.Start)
 	}
 	report, err := containerEngine.PlayKube(r.Context(), r.Body, options)
-	_ = r.Body.Close()
 	if err != nil {
 		utils.Error(w, http.StatusInternalServerError, fmt.Errorf("playing YAML file: %w", err))
 		return
@@ -132,7 +131,6 @@ func KubePlayDown(w http.ResponseWriter, r *http.Request) {
 
 	containerEngine := abi.ContainerEngine{Libpod: runtime}
 	report, err := containerEngine.PlayKubeDown(r.Context(), r.Body, entities.PlayKubeDownOptions{Force: query.Force})
-	_ = r.Body.Close()
 	if err != nil {
 		utils.Error(w, http.StatusInternalServerError, fmt.Errorf("tearing down YAML file: %w", err))
 		return

diff --git a/test/apiv2/80-kube.at b/test/apiv2/80-kube.at
@@ -49,9 +49,8 @@ t POST   libpod/kube/play $YAML 200 \
   .Pods[0].Containers[0]~[0-9a-f]\\{64\\}
 
 t DELETE libpod/kube/play $YAML 200 \
-  .Pods[0].ID~null \
-  .Pods[0].ContainerErrors=null \
-  .Pods[0].Containers[0]~null
+  .StopReport[0].Id~[0-9a-f]\\{64\\} \
+  .RmReport[0].Id~[0-9a-f]\\{64\\}
 
 # Make sure that play-kube works
 
@@ -61,9 +60,6 @@ t POST   libpod/play/kube $YAML 200 \
   .Pods[0].Containers[0]~[0-9a-f]\\{64\\}
 
 t DELETE libpod/play/kube $YAML 200 \
-  .Pods[0].ID~null \
-  .Pods[0].ContainerErrors=null \
-  .Pods[0].Containers[0]~null \
   .StopReport[0].Id~[0-9a-f]\\{64\\} \
   .RmReport[0].Id~[0-9a-f]\\{64\\}