Skip to content

Commit 8486603

Browse files
britaniarbritaniar
committed
revert controller_test.go
1 parent 623f26d commit 8486603

File tree

1 file changed

+4
-32
lines changed

1 file changed

+4
-32
lines changed

‎pkg/controllers/clusterresourceplacement/controller_test.go‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"fmt"
1313
"strconv"
1414
"testing"
15-
"time"
1615

1716
"github.com/google/go-cmp/cmp"
1817
"github.com/google/go-cmp/cmp/cmpopts"
@@ -34,9 +33,8 @@ import (
3433
)
3534

3635
const (
37-
testCRPName = "my-crp"
38-
crpGeneration = 15
39-
crpNameTemplate = "crp-%d"
36+
testCRPName = "my-crp"
37+
crpGeneration = 15
4038
)
4139

4240
var (
@@ -3076,7 +3074,6 @@ func TestHandleDelete(t *testing.T) {
30763074

30773075
func TestIsRolloutComplete(t *testing.T) {
30783076
crpGeneration := int64(25)
3079-
currentTime := metav1.Now()
30803077
tests := []struct {
30813078
name string
30823079
conditions []metav1.Condition
@@ -3089,37 +3086,31 @@ func TestIsRolloutComplete(t *testing.T) {
30893086
Status: metav1.ConditionTrue,
30903087
Type: string(fleetv1beta1.ClusterResourcePlacementAppliedConditionType),
30913088
ObservedGeneration: crpGeneration,
3092-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 5)),
30933089
},
30943090
{
30953091
Status: metav1.ConditionTrue,
30963092
Type: string(fleetv1beta1.ClusterResourcePlacementAvailableConditionType),
30973093
ObservedGeneration: crpGeneration,
3098-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 4)),
30993094
},
31003095
{
31013096
Status: metav1.ConditionTrue,
31023097
Type: string(fleetv1beta1.ClusterResourcePlacementOverriddenConditionType),
31033098
ObservedGeneration: crpGeneration,
3104-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 2)),
31053099
},
31063100
{
31073101
Status: metav1.ConditionTrue,
31083102
Type: string(fleetv1beta1.ClusterResourcePlacementRolloutStartedConditionType),
31093103
ObservedGeneration: crpGeneration,
3110-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second)),
31113104
},
31123105
{
31133106
Status: metav1.ConditionTrue,
31143107
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
31153108
ObservedGeneration: crpGeneration,
3116-
LastTransitionTime: currentTime,
31173109
},
31183110
{
31193111
Status: metav1.ConditionTrue,
31203112
Type: string(fleetv1beta1.ClusterResourcePlacementWorkSynchronizedConditionType),
31213113
ObservedGeneration: crpGeneration,
3122-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 3)),
31233114
},
31243115
},
31253116
want: true,
@@ -3131,7 +3122,6 @@ func TestIsRolloutComplete(t *testing.T) {
31313122
Status: metav1.ConditionUnknown,
31323123
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
31333124
ObservedGeneration: crpGeneration,
3134-
LastTransitionTime: currentTime,
31353125
},
31363126
},
31373127
want: false,
@@ -3143,7 +3133,6 @@ func TestIsRolloutComplete(t *testing.T) {
31433133
Status: metav1.ConditionTrue,
31443134
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
31453135
ObservedGeneration: crpGeneration,
3146-
LastTransitionTime: currentTime,
31473136
},
31483137
},
31493138
want: false,
@@ -3155,19 +3144,16 @@ func TestIsRolloutComplete(t *testing.T) {
31553144
Status: metav1.ConditionTrue,
31563145
Type: string(fleetv1beta1.ClusterResourcePlacementOverriddenConditionType),
31573146
ObservedGeneration: 1,
3158-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 2)),
31593147
},
31603148
{
31613149
Status: metav1.ConditionTrue,
31623150
Type: string(fleetv1beta1.ClusterResourcePlacementRolloutStartedConditionType),
31633151
ObservedGeneration: crpGeneration,
3164-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second)),
31653152
},
31663153
{
31673154
Status: metav1.ConditionTrue,
31683155
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
31693156
ObservedGeneration: crpGeneration,
3170-
LastTransitionTime: currentTime,
31713157
},
31723158
},
31733159
want: false,
@@ -3179,25 +3165,21 @@ func TestIsRolloutComplete(t *testing.T) {
31793165
Status: metav1.ConditionTrue,
31803166
Type: string(fleetv1beta1.ClusterResourcePlacementOverriddenConditionType),
31813167
ObservedGeneration: crpGeneration,
3182-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 2)),
31833168
},
31843169
{
31853170
Status: metav1.ConditionTrue,
31863171
Type: string(fleetv1beta1.ClusterResourcePlacementRolloutStartedConditionType),
31873172
ObservedGeneration: crpGeneration,
3188-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second)),
31893173
},
31903174
{
31913175
Status: metav1.ConditionTrue,
31923176
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
31933177
ObservedGeneration: crpGeneration,
3194-
LastTransitionTime: currentTime,
31953178
},
31963179
{
31973180
Status: metav1.ConditionFalse,
31983181
Type: string(fleetv1beta1.ClusterResourcePlacementWorkSynchronizedConditionType),
31993182
ObservedGeneration: crpGeneration,
3200-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 3)),
32013183
},
32023184
},
32033185
want: false,
@@ -3209,25 +3191,21 @@ func TestIsRolloutComplete(t *testing.T) {
32093191
Status: metav1.ConditionTrue,
32103192
Type: string(fleetv1beta1.ClusterResourcePlacementOverriddenConditionType),
32113193
ObservedGeneration: crpGeneration,
3212-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 2)),
32133194
},
32143195
{
32153196
Status: metav1.ConditionTrue,
32163197
Type: string(fleetv1beta1.ClusterResourcePlacementRolloutStartedConditionType),
32173198
ObservedGeneration: crpGeneration,
3218-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second)),
32193199
},
32203200
{
32213201
Status: metav1.ConditionTrue,
32223202
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
32233203
ObservedGeneration: crpGeneration,
3224-
LastTransitionTime: currentTime,
32253204
},
32263205
{
32273206
Status: metav1.ConditionTrue,
32283207
Type: string(fleetv1beta1.ClusterResourcePlacementWorkSynchronizedConditionType),
32293208
ObservedGeneration: crpGeneration,
3230-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 3)),
32313209
},
32323210
},
32333211
want: false,
@@ -3239,47 +3217,41 @@ func TestIsRolloutComplete(t *testing.T) {
32393217
Status: metav1.ConditionTrue,
32403218
Type: string(fleetv1beta1.ClusterResourcePlacementAppliedConditionType),
32413219
ObservedGeneration: crpGeneration,
3242-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 5)),
32433220
},
32443221
{
32453222
Status: metav1.ConditionFalse,
32463223
Type: string(fleetv1beta1.ClusterResourcePlacementAvailableConditionType),
32473224
ObservedGeneration: crpGeneration,
3248-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 4)),
32493225
},
32503226
{
32513227
Status: metav1.ConditionTrue,
32523228
Type: string(fleetv1beta1.ClusterResourcePlacementOverriddenConditionType),
32533229
ObservedGeneration: crpGeneration,
3254-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 2)),
32553230
},
32563231
{
32573232
Status: metav1.ConditionTrue,
32583233
Type: string(fleetv1beta1.ClusterResourcePlacementRolloutStartedConditionType),
32593234
ObservedGeneration: crpGeneration,
3260-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second)),
32613235
},
32623236
{
32633237
Status: metav1.ConditionTrue,
32643238
Type: string(fleetv1beta1.ClusterResourcePlacementScheduledConditionType),
32653239
ObservedGeneration: crpGeneration,
3266-
LastTransitionTime: currentTime,
32673240
},
32683241
{
32693242
Status: metav1.ConditionTrue,
32703243
Type: string(fleetv1beta1.ClusterResourcePlacementWorkSynchronizedConditionType),
32713244
ObservedGeneration: crpGeneration,
3272-
LastTransitionTime: metav1.NewTime(currentTime.Add(time.Second * 3)),
32733245
},
32743246
},
32753247
want: false,
32763248
},
32773249
}
3278-
for i, tc := range tests {
3250+
for _, tc := range tests {
32793251
t.Run(tc.name, func(t *testing.T) {
32803252
crp := &fleetv1beta1.ClusterResourcePlacement{
32813253
ObjectMeta: metav1.ObjectMeta{
3282-
Name: testCRPName + strconv.Itoa(i),
3254+
Name: testCRPName,
32833255
Generation: crpGeneration,
32843256
},
32853257
Status: fleetv1beta1.ClusterResourcePlacementStatus{

0 commit comments

Comments
 (0)