Skip to content

Commit 6976ded

Browse files
ardagucluardaguclu
committed
Use renamed ObjectGoPrintSideBySide function
1 parent 42cd2fa commit 6976ded

File tree

12 files changed

+26
-28
lines changed

12 files changed

+26
-28
lines changed

‎pkg/cli/admin/nodeimage/mirrorbuilder_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ var defaultIdmsSetList = ocpv1.ImageDigestMirrorSetList{
4141
var defaultIdms = `apiVersion: config.openshift.io/v1
4242
kind: ImageDigestMirrorSet
4343
metadata:
44-
creationTimestamp: null
4544
name: image-digest
4645
spec:
4746
imageDigestMirrors:
@@ -115,7 +114,6 @@ var icspListDifferentThanIdms = operatorv1alpha1.ImageContentSourcePolicyList{
115114
var icspPlusIdms = `apiVersion: config.openshift.io/v1
116115
kind: ImageDigestMirrorSet
117116
metadata:
118-
creationTimestamp: null
119117
name: image-digest
120118
spec:
121119
imageDigestMirrors:

‎pkg/cli/admin/policy/modify_roles_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ func TestModifyRoleBindingWarnings(t *testing.T) {
13721372
func compareResources(t *testing.T, expected, actual interface{}) {
13731373
if eq := equality.Semantic.DeepEqual(expected, actual); !eq {
13741374
t.Errorf("Resource does not match expected value: %s",
1375-
diffutil.ObjectDiff(expected, actual))
1375+
diffutil.ObjectGoPrintSideBySide(expected, actual))
13761376
}
13771377
}
13781378
func getRoleBindingAbstractionsList(rbacClient rbacv1client.RbacV1Interface, namespace string) ([]*roleBindingAbstraction, error) {

‎pkg/cli/admin/prune/imageprune/helper_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func TestDefaultImagePinger(t *testing.T) {
210210
ers = []string{}
211211
}
212212
if a := rs.getRequests(); !reflect.DeepEqual(a, ers) {
213-
t.Errorf("[%s] got unexpected requests: %s", tc.name, diff.ObjectDiff(a, ers))
213+
t.Errorf("[%s] got unexpected requests: %s", tc.name, diff.ObjectGoPrintSideBySide(a, ers))
214214
}
215215
})
216216
}

‎pkg/cli/admin/prune/imageprune/prune_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,15 +1950,15 @@ func TestImagePruning(t *testing.T) {
19501950

19511951
expectedImageDeletions := sets.NewString(test.expectedImageDeletions...)
19521952
if a, e := imageDeleter.invocations, expectedImageDeletions; !reflect.DeepEqual(a, e) {
1953-
t.Errorf("unexpected image deletions (-actual, +expected): %s", diff.ObjectDiff(a, e))
1953+
t.Errorf("unexpected image deletions (-actual, +expected): %s", diff.ObjectGoPrintSideBySide(a, e))
19541954
}
19551955
if want := expectedImageDeletions.Len() - len(test.expectedImageDeletionFailures); stats.DeletedImages != want {
19561956
t.Errorf("image deletions: got %d, want %d", stats.DeletedImages, want)
19571957
}
19581958

19591959
expectedStreamUpdates := sets.NewString(test.expectedStreamUpdates...)
19601960
if a, e := streamDeleter.invocations, expectedStreamUpdates; !reflect.DeepEqual(a, e) {
1961-
t.Errorf("unexpected stream updates (-actual, +expected): %s", diff.ObjectDiff(a, e))
1961+
t.Errorf("unexpected stream updates (-actual, +expected): %s", diff.ObjectGoPrintSideBySide(a, e))
19621962
}
19631963
expectedImageStreamUpdates := sets.NewString()
19641964
expectedImageStreamItemsDeletions := 0
@@ -1978,23 +1978,23 @@ func TestImagePruning(t *testing.T) {
19781978

19791979
expectedLayerLinkDeletions := sets.NewString(test.expectedLayerLinkDeletions...)
19801980
if a, e := layerLinkDeleter.invocations, expectedLayerLinkDeletions; !reflect.DeepEqual(a, e) {
1981-
t.Errorf("unexpected layer link deletions (-actual, +expected): %s", diff.ObjectDiff(a, e))
1981+
t.Errorf("unexpected layer link deletions (-actual, +expected): %s", diff.ObjectGoPrintSideBySide(a, e))
19821982
}
19831983
if want := expectedLayerLinkDeletions.Len() - len(test.expectedLayerLinkDeletionFailures); stats.DeletedLayerLinks != want {
19841984
t.Errorf("layer link deletions: got %d, want %d", stats.DeletedLayerLinks, want)
19851985
}
19861986

19871987
expectedManifestLinkDeletions := sets.NewString(test.expectedManifestLinkDeletions...)
19881988
if a, e := manifestDeleter.invocations, expectedManifestLinkDeletions; !reflect.DeepEqual(a, e) {
1989-
t.Errorf("unexpected manifest link deletions (-actual, +expected): %s", diff.ObjectDiff(a, e))
1989+
t.Errorf("unexpected manifest link deletions (-actual, +expected): %s", diff.ObjectGoPrintSideBySide(a, e))
19901990
}
19911991
if want := expectedManifestLinkDeletions.Len() - len(test.expectedManifestLinkDeletionFailures); stats.DeletedManifestLinks != want {
19921992
t.Errorf("manifest link deletions: got %d, want %d", stats.DeletedManifestLinks, want)
19931993
}
19941994

19951995
expectedBlobDeletions := sets.NewString(test.expectedBlobDeletions...)
19961996
if a, e := blobDeleter.invocations, expectedBlobDeletions; !reflect.DeepEqual(a, e) {
1997-
t.Errorf("unexpected blob deletions (-actual, +expected): %s", diff.ObjectDiff(a, e))
1997+
t.Errorf("unexpected blob deletions (-actual, +expected): %s", diff.ObjectGoPrintSideBySide(a, e))
19981998
}
19991999
if want := expectedBlobDeletions.Len() - len(test.expectedBlobDeletionFailures); stats.DeletedBlobs != want {
20002000
t.Errorf("blob deletions: got %d, want %d", stats.DeletedBlobs, want)
@@ -2054,7 +2054,7 @@ func TestLayerDeleter(t *testing.T) {
20542054
layerLinkDeleter.DeleteLayerLink("repo", "layer1")
20552055

20562056
if e := []string{"DELETE:http://registry1/v2/repo/blobs/layer1"}; !reflect.DeepEqual(actions, e) {
2057-
t.Errorf("unexpected actions: %s", diff.ObjectDiff(actions, e))
2057+
t.Errorf("unexpected actions: %s", diff.ObjectGoPrintSideBySide(actions, e))
20582058
}
20592059
}
20602060

@@ -2071,7 +2071,7 @@ func TestNotFoundLayerDeleter(t *testing.T) {
20712071
layerLinkDeleter.DeleteLayerLink("repo", "layer1")
20722072

20732073
if e := []string{"DELETE:https://registry1/v2/repo/blobs/layer1"}; !reflect.DeepEqual(actions, e) {
2074-
t.Errorf("unexpected actions: %s", diff.ObjectDiff(actions, e))
2074+
t.Errorf("unexpected actions: %s", diff.ObjectGoPrintSideBySide(actions, e))
20752075
}
20762076
}
20772077

@@ -2265,13 +2265,13 @@ func TestRegistryPruning(t *testing.T) {
22652265
p.Prune(streamDeleter, layerLinkDeleter, manifestDeleter, blobDeleter, imageDeleter)
22662266

22672267
if a, e := layerLinkDeleter.invocations, test.expectedLayerLinkDeletions; !reflect.DeepEqual(a, e) {
2268-
t.Errorf("unexpected layer link deletions: %s", diff.ObjectDiff(a, e))
2268+
t.Errorf("unexpected layer link deletions: %s", diff.ObjectGoPrintSideBySide(a, e))
22692269
}
22702270
if a, e := blobDeleter.invocations, test.expectedBlobDeletions; !reflect.DeepEqual(a, e) {
2271-
t.Errorf("unexpected blob deletions: %s", diff.ObjectDiff(a, e))
2271+
t.Errorf("unexpected blob deletions: %s", diff.ObjectGoPrintSideBySide(a, e))
22722272
}
22732273
if a, e := manifestDeleter.invocations, test.expectedManifestDeletions; !reflect.DeepEqual(a, e) {
2274-
t.Errorf("unexpected manifest deletions: %s", diff.ObjectDiff(a, e))
2274+
t.Errorf("unexpected manifest deletions: %s", diff.ObjectGoPrintSideBySide(a, e))
22752275
}
22762276
})
22772277
}

‎pkg/cli/admin/prune/images/images_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func TestImagePruneErrOnBadReference(t *testing.T) {
166166
`deployment/dep1 namespace=foo: container app: invalid image reference "do not blame me": invalid reference format`)
167167

168168
if a, e := badRefErrors, expBadRefErrors; !a.Equal(e) {
169-
t.Fatalf("got unexpected invalid reference errors: %s", diff.ObjectDiff(a, e))
169+
t.Fatalf("got unexpected invalid reference errors: %s", diff.ObjectGoPrintSideBySide(a, e))
170170
}
171171

172172
if expectClientVersionMismatch {

‎pkg/cli/admin/release/git_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ func Test_mergeLogForRepo(t *testing.T) {
298298
return
299299
}
300300
if !reflect.DeepEqual(got, tt.want) {
301-
t.Errorf("mergeLogForRepo(): %s", diff.ObjectReflectDiff(tt.want, got))
301+
t.Errorf("mergeLogForRepo(): %s", diff.ObjectGoPrintSideBySide(tt.want, got))
302302
}
303303
if elidedCommits != tt.wantElidedCommits {
304304
t.Errorf("mergeLogForRepo(): %d elided commits report differs from expected %d", elidedCommits, tt.wantElidedCommits)

‎pkg/cli/admin/release/info_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,13 +529,13 @@ func Test_readComponentVersions(t *testing.T) {
529529
ioStreams := genericiooptions.NewTestIOStreamsDiscard()
530530
got, got1, got2 := readComponentVersions(tt.is, ioStreams.ErrOut)
531531
if !reflect.DeepEqual(got, tt.want) {
532-
t.Errorf("%s", diff.ObjectReflectDiff(got, tt.want))
532+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(got, tt.want))
533533
}
534534
if !reflect.DeepEqual(got1, tt.wantTags) {
535-
t.Errorf("%s", diff.ObjectReflectDiff(got1, tt.wantTags))
535+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(got1, tt.wantTags))
536536
}
537537
if a, b := asStrings(got2), asStrings(tt.wantErr); !reflect.DeepEqual(a, b) {
538-
t.Errorf("%s", diff.ObjectReflectDiff(a, b))
538+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(a, b))
539539
}
540540
})
541541
}

‎pkg/cli/admin/release/mirror_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func Test_dedupeSortSources(t *testing.T) {
114114
t.Run(tt.name, func(t *testing.T) {
115115
uniqueSources := dedupeSortSources(tt.sources)
116116
if !reflect.DeepEqual(uniqueSources, tt.expectedSources) {
117-
t.Errorf("%s", diff.ObjectReflectDiff(uniqueSources, tt.expectedSources))
117+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(uniqueSources, tt.expectedSources))
118118
}
119119
})
120120
}
@@ -240,7 +240,7 @@ func Test_convertMirrorSetToImageDigestMirrors(t *testing.T) {
240240
t.Run(tt.name, func(t *testing.T) {
241241
idmsSources := convertMirrorSetToImageDigestMirrors(tt.sources)
242242
if !reflect.DeepEqual(idmsSources, tt.expectedSources) {
243-
t.Errorf("%s", diff.ObjectReflectDiff(idmsSources, tt.expectedSources))
243+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(idmsSources, tt.expectedSources))
244244
}
245245
})
246246
}
@@ -301,7 +301,7 @@ spec:
301301
}
302302
got := buf.Bytes()
303303
if !reflect.DeepEqual(got, tc.want) {
304-
t.Errorf("%s", diff.ObjectReflectDiff(got, tc.want))
304+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(got, tc.want))
305305
}
306306
})
307307
}
@@ -362,7 +362,7 @@ spec:
362362
}
363363
got := buf.Bytes()
364364
if !reflect.DeepEqual(got, tc.want) {
365-
t.Errorf("%s", diff.ObjectReflectDiff(got, tc.want))
365+
t.Errorf("%s", diff.ObjectGoPrintSideBySide(got, tc.want))
366366
}
367367
})
368368
}

‎pkg/cli/deployer/strategy/rolling/rolling_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ func TestRolling_deployRolling(t *testing.T) {
124124
}
125125

126126
if !reflect.DeepEqual(latest, rollingConfig.OldRc) {
127-
t.Errorf("unexpected rollingConfig.OldRc:%s\n", diff.ObjectGoPrintDiff(latest, rollingConfig.OldRc))
127+
t.Errorf("unexpected rollingConfig.OldRc:%s\n", diff.ObjectGoPrintSideBySide(latest, rollingConfig.OldRc))
128128
}
129129

130130
if !reflect.DeepEqual(deployment, rollingConfig.NewRc) {
131-
t.Errorf("unexpected rollingConfig.NewRc:%s\n", diff.ObjectGoPrintDiff(latest, rollingConfig.OldRc))
131+
t.Errorf("unexpected rollingConfig.NewRc:%s\n", diff.ObjectGoPrintSideBySide(latest, rollingConfig.OldRc))
132132
}
133133

134134
if e, a := 1*time.Second, rollingConfig.Interval; e != a {

‎pkg/cli/deployer/strategy/support/lifecycle_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ func TestHookExecutor_makeHookPod(t *testing.T) {
516516
// Copy the ActiveDeadlineSeconds the deployer pod is running for 5 seconds already
517517
test.expected.Spec.ActiveDeadlineSeconds = pod.Spec.ActiveDeadlineSeconds
518518
if !apiequality.Semantic.DeepEqual(pod, test.expected) {
519-
t.Errorf("unexpected pod diff: %v", diff.ObjectReflectDiff(pod, test.expected))
519+
t.Errorf("unexpected pod diff: %v", diff.ObjectGoPrintSideBySide(pod, test.expected))
520520
}
521521
}
522522
}

0 commit comments

Comments
 (0)