github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

apimachinery: Fix Dropped Test Error (#85427)

Browse Source 
* 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
This commit is contained in:
Lars Lehtonen 2019-11-23 15:31:50 -08:00 committed by Kubernetes Prow Robot
parent 459b1d76bf
commit b1c39e9b16
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.staticcheck_failures
View File

@ -115,7 +115,6 @@ vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation
vendor/k8s.io/apimachinery/pkg/conversion vendor/k8s.io/apimachinery/pkg/conversion
vendor/k8s.io/apimachinery/pkg/labels vendor/k8s.io/apimachinery/pkg/labels
vendor/k8s.io/apimachinery/pkg/runtime 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/json
vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning vendor/k8s.io/apimachinery/pkg/runtime/serializer/versioning
vendor/k8s.io/apimachinery/pkg/util/framer vendor/k8s.io/apimachinery/pkg/util/framer

3
staging/src/k8s.io/apimachinery/pkg/conversion/converter_test.go
View File

@ -568,6 +568,9 @@ func TestConverter_MapElemAddr(t *testing.T) {
} }
third := Foo{} third := Foo{}
err = c.Convert(&second, &third, AllowDifferentFieldTypeNames, nil) 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) { if e, a := first, third; !reflect.DeepEqual(e, a) {
t.Errorf("Unexpected diff: %v", diff.ObjectDiff(e, a)) t.Errorf("Unexpected diff: %v", diff.ObjectDiff(e, a))
} }

3
staging/src/k8s.io/apimachinery/pkg/runtime/serializer/codec_test.go
View File

@ -346,6 +346,9 @@ func TestDirectCodec(t *testing.T) {
t.Fatal(string(out)) t.Fatal(string(out))
} }
a, _, err := directDecoder.Decode(out, nil, nil) a, _, err := directDecoder.Decode(out, nil, nil)
if err != nil {
t.Fatalf("error on Decode: %v", err)
}
e := &serializertesting.ExternalTestType1{ e := &serializertesting.ExternalTestType1{
MyWeirdCustomEmbeddedVersionKindField: serializertesting.MyWeirdCustomEmbeddedVersionKindField{ MyWeirdCustomEmbeddedVersionKindField: serializertesting.MyWeirdCustomEmbeddedVersionKindField{
APIVersion: "v1", APIVersion: "v1",

1
staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go
View File

@ -427,6 +427,7 @@ func TestConnectWithRedirects(t *testing.T) {
require.NoError(t, err, "unexpected request error") require.NoError(t, err, "unexpected request error")
result, err := ioutil.ReadAll(resp.Body) result, err := ioutil.ReadAll(resp.Body)
assert.Nil(t, err)
require.NoError(t, resp.Body.Close()) require.NoError(t, resp.Body.Close())
if test.expectedRedirects < len(test.redirects) { if test.expectedRedirects < len(test.redirects) {
// Expect the last redirect to be returned. // Expect the last redirect to be returned.