github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +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()