scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #127691 from mmorel-35/testifylint/expected-actual@k8s.io/apimachinery

Browse Source 
fix: enable expected-actual rule from testifylint in module `k8s.io/apimachinery`
This commit is contained in:
Kubernetes Prow Robot
2024-09-29 04:58:08 +01:00
committed by GitHub
parent 40aea28ed9 0006a3cc37
commit a35cdc2fd9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/helpers_test.go
View File

@@ -178,7 +178,7 @@ func TestSetNestedStringSlice(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Len(t, obj["x"], 3) assert.Len(t, obj["x"], 3)
assert.Len(t, obj["x"].(map[string]interface{})["z"], 1) assert.Len(t, obj["x"].(map[string]interface{})["z"], 1)
assert.Equal(t, obj["x"].(map[string]interface{})["z"].([]interface{})[0], "bar") assert.Equal(t, "bar", obj["x"].(map[string]interface{})["z"].([]interface{})[0])
} }
func TestSetNestedSlice(t *testing.T) { func TestSetNestedSlice(t *testing.T) {
@@ -193,7 +193,7 @@ func TestSetNestedSlice(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Len(t, obj["x"], 3) assert.Len(t, obj["x"], 3)
assert.Len(t, obj["x"].(map[string]interface{})["z"], 1) assert.Len(t, obj["x"].(map[string]interface{})["z"], 1)
assert.Equal(t, obj["x"].(map[string]interface{})["z"].([]interface{})[0], "bar") assert.Equal(t, "bar", obj["x"].(map[string]interface{})["z"].([]interface{})[0])
} }
func TestSetNestedStringMap(t *testing.T) { func TestSetNestedStringMap(t *testing.T) {
@@ -208,7 +208,7 @@ func TestSetNestedStringMap(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Len(t, obj["x"], 3) assert.Len(t, obj["x"], 3)
assert.Len(t, obj["x"].(map[string]interface{})["z"], 1) assert.Len(t, obj["x"].(map[string]interface{})["z"], 1)
assert.Equal(t, obj["x"].(map[string]interface{})["z"].(map[string]interface{})["b"], "bar") assert.Equal(t, "bar", obj["x"].(map[string]interface{})["z"].(map[string]interface{})["b"])
} }
func TestSetNestedMap(t *testing.T) { func TestSetNestedMap(t *testing.T) {
@@ -223,5 +223,5 @@ func TestSetNestedMap(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Len(t, obj["x"], 3) assert.Len(t, obj["x"], 3)
assert.Len(t, obj["x"].(map[string]interface{})["z"], 1) assert.Len(t, obj["x"].(map[string]interface{})["z"], 1)
assert.Equal(t, obj["x"].(map[string]interface{})["z"].(map[string]interface{})["b"], "bar") assert.Equal(t, "bar", obj["x"].(map[string]interface{})["z"].(map[string]interface{})["b"])
} }

4
staging/src/k8s.io/apimachinery/pkg/util/managedfields/internal/typeconverter_test.go
View File

@@ -287,7 +287,7 @@ func TestIndexModels(t *testing.T) {
resultNames[k] = *v.TypeRef.NamedType resultNames[k] = *v.TypeRef.NamedType
} }
require.Equal(t, resultNames, map[schema.GroupVersionKind]string{ require.Equal(t, map[schema.GroupVersionKind]string{
{ {
Group: "mygroup", Group: "mygroup",
Version: "v1", Version: "v1",
@@ -313,5 +313,5 @@ func TestIndexModels(t *testing.T) {
Version: "v3", Version: "v3",
Kind: "MyOtherKind", Kind: "MyOtherKind",
}: "def3", }: "def3",
}) }, resultNames)
} }