From b1c39e9b1606a3022e8e7e0bd9ddc8741b245435 Mon Sep 17 00:00:00 2001
From: Lars Lehtonen <lars.lehtonen@gmail.com>
Date: Sat, 23 Nov 2019 15:31:50 -0800
Subject: [PATCH] apimachinery: Fix Dropped Test Error (#85427)

* apimachinery: fix dropped test error in pkg/util/net

* apimachinery: fix dropped test error in pkg/runtime/serializer

* apimachinery: fix dropped test error in pkg/conversion

* apimachinery: fix staticcheck warning
---
 hack/.staticcheck_failures                                     | 1 -
 .../src/k8s.io/apimachinery/pkg/conversion/converter_test.go   | 3 +++
 .../k8s.io/apimachinery/pkg/runtime/serializer/codec_test.go   | 3 +++
 staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go      | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 8aa0b1a2888..1ad70e864c2 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -115,7 +115,6 @@ vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation
 vendor/k8s.io/apimachinery/pkg/conversion
 vendor/k8s.io/apimachinery/pkg/labels
 vendor/k8s.io/apimachinery/pkg/runtime
-vendor/k8s.io/apimachinery/pkg/runtime/serializer
 vendor/k8s.io/apimachinery/pkg/runtime/serializer/json
 vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning
 vendor/k8s.io/apimachinery/pkg/util/framer
diff --git a/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go b/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go
index b687f25d32d..b13ffece28d 100644
--- a/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go
@@ -568,6 +568,9 @@ func TestConverter_MapElemAddr(t *testing.T) {
 	}
 	third := Foo{}
 	err = c.Convert(&second, &third, AllowDifferentFieldTypeNames, nil)
+	if err != nil {
+		t.Fatalf("error on Convert: %v", err)
+	}
 	if e, a := first, third; !reflect.DeepEqual(e, a) {
 		t.Errorf("Unexpected diff: %v", diff.ObjectDiff(e, a))
 	}
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/codec_test.go b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/codec_test.go
index 1505753a90a..1c6add4b3a0 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/codec_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/codec_test.go
@@ -346,6 +346,9 @@ func TestDirectCodec(t *testing.T) {
 		t.Fatal(string(out))
 	}
 	a, _, err := directDecoder.Decode(out, nil, nil)
+	if err != nil {
+		t.Fatalf("error on Decode: %v", err)
+	}
 	e := &serializertesting.ExternalTestType1{
 		MyWeirdCustomEmbeddedVersionKindField: serializertesting.MyWeirdCustomEmbeddedVersionKindField{
 			APIVersion: "v1",
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go b/staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go
index 4e4e317b9a4..51d91dd84d7 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go
@@ -427,6 +427,7 @@ func TestConnectWithRedirects(t *testing.T) {
 			require.NoError(t, err, "unexpected request error")
 
 			result, err := ioutil.ReadAll(resp.Body)
+			assert.Nil(t, err)
 			require.NoError(t, resp.Body.Close())
 			if test.expectedRedirects < len(test.redirects) {
 				// Expect the last redirect to be returned.