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

Print/log pointers of structs with %#v instead of %+v

Browse Source 
There are many places in k8s where %+v is used to format a pointer
to struct, which isn't working as expected.

Fixes #26591
This commit is contained in:
Michal Rostecki
2016-06-14 14:04:38 +02:00
parent ed763b8034
commit 59ca5986dd
35 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/controller/replication/replication_controller_test.go
View File

@@ -343,7 +343,7 @@ func TestSyncReplicationControllerDormancy(t *testing.T) {
// Get the key for the controller
rcKey, err := controller.KeyFunc(controllerSpec)
if err != nil {
t.Errorf("Couldn't get key for object %+v: %v", controllerSpec, err)
t.Errorf("Couldn't get key for object %#v: %v", controllerSpec, err)
}
// Lowering expectations should lead to a sync that creates a replica, however the
@@ -686,7 +686,7 @@ func doTestControllerBurstReplicas(t *testing.T, burstReplicas, numReplicas int)
rcKey, err := controller.KeyFunc(controllerSpec)
if err != nil {
t.Errorf("Couldn't get key for object %+v: %v", controllerSpec, err)
t.Errorf("Couldn't get key for object %#v: %v", controllerSpec, err)
}
// Size up the controller, then size it down, and confirm the expected create/delete pattern
@@ -865,7 +865,7 @@ func TestDeleteControllerAndExpectations(t *testing.T) {
// Get the RC key
rcKey, err := controller.KeyFunc(rc)
if err != nil {
t.Errorf("Couldn't get key for object %+v: %v", rc, err)
t.Errorf("Couldn't get key for object %#v: %v", rc, err)
}
// This is to simulate a concurrent addPod, that has a handle on the expectations
@@ -965,7 +965,7 @@ func TestDeletionTimestamp(t *testing.T) {
manager.rcStore.Indexer.Add(controllerSpec)
rcKey, err := controller.KeyFunc(controllerSpec)
if err != nil {
t.Errorf("Couldn't get key for object %+v: %v", controllerSpec, err)
t.Errorf("Couldn't get key for object %#v: %v", controllerSpec, err)
}
pod := newPodList(nil, 1, api.PodPending, controllerSpec, "pod").Items[0]
pod.DeletionTimestamp = &unversioned.Time{Time: time.Now()}
@@ -982,7 +982,7 @@ func TestDeletionTimestamp(t *testing.T) {
podExp, exists, err := manager.expectations.GetExpectations(rcKey)
if !exists || err != nil || !podExp.Fulfilled() {
t.Fatalf("Wrong expectations %+v", podExp)
t.Fatalf("Wrong expectations %#v", podExp)
}
// An update from no deletion timestamp to having one should be treated
@@ -999,7 +999,7 @@ func TestDeletionTimestamp(t *testing.T) {
podExp, exists, err = manager.expectations.GetExpectations(rcKey)
if !exists || err != nil || !podExp.Fulfilled() {
t.Fatalf("Wrong expectations %+v", podExp)
t.Fatalf("Wrong expectations %#v", podExp)
}
// An update to the pod (including an update to the deletion timestamp)
@@ -1017,7 +1017,7 @@ func TestDeletionTimestamp(t *testing.T) {
podExp, exists, err = manager.expectations.GetExpectations(rcKey)
if !exists || err != nil || podExp.Fulfilled() {
t.Fatalf("Wrong expectations %+v", podExp)
t.Fatalf("Wrong expectations %#v", podExp)
}
// A pod with a non-nil deletion timestamp should also be ignored by the
@@ -1025,7 +1025,7 @@ func TestDeletionTimestamp(t *testing.T) {
manager.deletePod(&pod)
podExp, exists, err = manager.expectations.GetExpectations(rcKey)
if !exists || err != nil || podExp.Fulfilled() {
t.Fatalf("Wrong expectations %+v", podExp)
t.Fatalf("Wrong expectations %#v", podExp)
}
// Deleting the second pod should clear expectations.
@@ -1039,7 +1039,7 @@ func TestDeletionTimestamp(t *testing.T) {
podExp, exists, err = manager.expectations.GetExpectations(rcKey)
if !exists || err != nil || !podExp.Fulfilled() {
t.Fatalf("Wrong expectations %+v", podExp)
t.Fatalf("Wrong expectations %#v", podExp)
}
}