github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

replace spew methods with dump methods

Browse Source
This commit is contained in:
Hao Ruan
2023-04-13 09:41:07 +08:00
parent c3e3ff989a
commit c4e1b01416
33 changed files with 80 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/bootstrap/bootstrapsigner_test.go
View File

@@ -20,9 +20,7 @@ import (
"context"
"testing"
"github.com/davecgh/go-spew/spew"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/informers"
@@ -34,10 +32,6 @@ import (
"k8s.io/kubernetes/pkg/controller"
)
func init() {
spew.Config.DisableMethods = true
}
const testTokenID = "abc123"
func newSigner() (*Signer, *fake.Clientset, coreinformers.SecretInformer, coreinformers.ConfigMapInformer, error) {

11
pkg/controller/bootstrap/common_test.go
View File

@@ -19,11 +19,10 @@ package bootstrap
import (
"testing"
"github.com/davecgh/go-spew/spew"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/dump"
core "k8s.io/client-go/testing"
bootstrapapi "k8s.io/cluster-bootstrap/token/api"
"k8s.io/kubernetes/pkg/apis/core/helper"
@@ -56,13 +55,13 @@ func addSecretSigningUsage(s *v1.Secret, value string) {
func verifyActions(t *testing.T, expected, actual []core.Action) {
for i, a := range actual {
if len(expected) < i+1 {
t.Errorf("%d unexpected actions: %s", len(actual)-len(expected), spew.Sdump(actual[i:]))
t.Errorf("%d unexpected actions: %s", len(actual)-len(expected), dump.Pretty(actual[i:]))
break
}
e := expected[i]
if !helper.Semantic.DeepEqual(e, a) {
t.Errorf("Expected\n\t%s\ngot\n\t%s", spew.Sdump(e), spew.Sdump(a))
t.Errorf("Expected\n\t%s\ngot\n\t%s", dump.Pretty(e), dump.Pretty(a))
continue
}
}
@@ -70,7 +69,7 @@ func verifyActions(t *testing.T, expected, actual []core.Action) {
if len(expected) > len(actual) {
t.Errorf("%d additional expected actions", len(expected)-len(actual))
for _, a := range expected[len(actual):] {
t.Logf(" %s", spew.Sdump(a))
t.Logf(" %s", dump.Pretty(a))
}
}
}

6
pkg/controller/bootstrap/tokencleaner_test.go
View File

@@ -21,8 +21,6 @@ import (
"testing"
"time"
"github.com/davecgh/go-spew/spew"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/wait"
@@ -33,10 +31,6 @@ import (
api "k8s.io/kubernetes/pkg/apis/core"
)
func init() {
spew.Config.DisableMethods = true
}
func newTokenCleaner() (*TokenCleaner, *fake.Clientset, coreinformers.SecretInformer, error) {
options := DefaultTokenCleanerOptions()
cl := fake.NewSimpleClientset()

10
pkg/controller/garbagecollector/dump_test.go
View File

@@ -22,11 +22,11 @@ import (
"path/filepath"
"testing"
"github.com/davecgh/go-spew/spew"
"github.com/google/go-cmp/cmp"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/dump"
)
var (
@@ -338,23 +338,23 @@ func TestToDOTGraphObj(t *testing.T) {
func compareGraphs(expectedNodes, actualNodes []*dotVertex, expectedEdges, actualEdges []dotEdge, t *testing.T) {
if len(expectedNodes) != len(actualNodes) {
t.Fatal(spew.Sdump(actualNodes))
t.Fatal(dump.Pretty(actualNodes))
}
for i := range expectedNodes {
currExpected := expectedNodes[i]
currActual := actualNodes[i]
if currExpected.uid != currActual.uid {
t.Errorf("expected %v, got %v", spew.Sdump(currExpected), spew.Sdump(currActual))
t.Errorf("expected %v, got %v", dump.Pretty(currExpected), dump.Pretty(currActual))
}
}
if len(expectedEdges) != len(actualEdges) {
t.Fatal(spew.Sdump(actualEdges))
t.Fatal(dump.Pretty(actualEdges))
}
for i := range expectedEdges {
currExpected := expectedEdges[i]
currActual := actualEdges[i]
if currExpected != currActual {
t.Errorf("expected %v, got %v", spew.Sdump(currExpected), spew.Sdump(currActual))
t.Errorf("expected %v, got %v", dump.Pretty(currExpected), dump.Pretty(currActual))
}
}
}

4
pkg/controller/serviceaccount/tokens_controller_test.go
View File

@@ -21,12 +21,12 @@ import (
"testing"
"time"
"github.com/davecgh/go-spew/spew"
"gopkg.in/square/go-jose.v2/jwt"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/dump"
utilrand "k8s.io/apimachinery/pkg/util/rand"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
@@ -547,7 +547,7 @@ func TestTokenCreation(t *testing.T) {
expectedAction := tc.ExpectedActions[i]
if !reflect.DeepEqual(expectedAction, action) {
t.Errorf("%s:\nExpected:\n%s\ngot:\n%s", k, spew.Sdump(expectedAction), spew.Sdump(action))
t.Errorf("%s:\nExpected:\n%s\ngot:\n%s", k, dump.Pretty(expectedAction), dump.Pretty(action))
continue
}
}

7
pkg/controller/volume/pvcprotection/pvc_protection_controller_test.go
View File

@@ -23,8 +23,6 @@ import (
"testing"
"time"
"github.com/davecgh/go-spew/spew"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
@@ -32,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/dump"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
clienttesting "k8s.io/client-go/testing"
@@ -470,13 +469,13 @@ func TestPVCProtectionController(t *testing.T) {
actions := client.Actions()
for i, action := range actions {
if len(test.expectedActions) < i+1 {
t.Errorf("Test %q: %d unexpected actions: %+v", test.name, len(actions)-len(test.expectedActions), spew.Sdump(actions[i:]))
t.Errorf("Test %q: %d unexpected actions: %+v", test.name, len(actions)-len(test.expectedActions), dump.Pretty(actions[i:]))
break
}
expectedAction := test.expectedActions[i]
if !reflect.DeepEqual(expectedAction, action) {
t.Errorf("Test %q: action %d\nExpected:\n%s\ngot:\n%s", test.name, i, spew.Sdump(expectedAction), spew.Sdump(action))
t.Errorf("Test %q: action %d\nExpected:\n%s\ngot:\n%s", test.name, i, dump.Pretty(expectedAction), dump.Pretty(action))
}
}

5
pkg/controller/volume/pvprotection/pv_protection_controller_test.go
View File

@@ -23,14 +23,13 @@ import (
"testing"
"time"
"github.com/davecgh/go-spew/spew"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/dump"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
clienttesting "k8s.io/client-go/testing"
@@ -252,7 +251,7 @@ func TestPVProtectionController(t *testing.T) {
actions := client.Actions()
if !reflect.DeepEqual(actions, test.expectedActions) {
t.Errorf("Test %q: action not expected\nExpected:\n%s\ngot:\n%s", test.name, spew.Sdump(test.expectedActions), spew.Sdump(actions))
t.Errorf("Test %q: action not expected\nExpected:\n%s\ngot:\n%s", test.name, dump.Pretty(test.expectedActions), dump.Pretty(actions))
}
}