@@ -17,17 +17,12 @@ import (
1717 "errors"
1818 "strings"
1919 "testing"
20- "time"
2120
2221 "github.com/stretchr/testify/assert"
2322 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24- utilclock "k8s.io/utils/clock"
25- fakeclock "k8s.io/utils/clock/testing"
2623 gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
2724)
2825
29- var clock utilclock.Clock = utilclock.RealClock {}
30-
3126func TestConditionChanged (t * testing.T ) {
3227 testCases := []struct {
3328 name string
@@ -95,17 +90,6 @@ func TestConditionChanged(t *testing.T) {
9590}
9691
9792func TestMergeConditions (t * testing.T ) {
98- // Inject a fake clock and don't forget to reset it
99- fakeClock := fakeclock .NewFakeClock (time.Time {})
100- clock = fakeClock
101- defer func () {
102- clock = utilclock.RealClock {}
103- }()
104-
105- start := fakeClock .Now ()
106- middle := start .Add (1 * time .Minute )
107- later := start .Add (2 * time .Minute )
108-
10993 gen := int64 (1 )
11094
11195 testCases := []struct {
@@ -117,69 +101,65 @@ func TestMergeConditions(t *testing.T) {
117101 {
118102 name : "status updated" ,
119103 current : []metav1.Condition {
120- newCondition ("available" , "false" , "Reason" , "Message" , start , gen ),
104+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
121105 },
122106 updates : []metav1.Condition {
123- newCondition ("available" , "true" , "Reason" , "Message" , middle , gen ),
107+ newCondition ("available" , "true" , "Reason" , "Message" , gen ),
124108 },
125109 expected : []metav1.Condition {
126- newCondition ("available" , "true" , "Reason" , "Message" , middle , gen ),
110+ newCondition ("available" , "true" , "Reason" , "Message" , gen ),
127111 },
128112 },
129113 {
130114 name : "reason updated" ,
131115 current : []metav1.Condition {
132- newCondition ("available" , "false" , "Reason" , "Message" , start , gen ),
116+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
133117 },
134118 updates : []metav1.Condition {
135- newCondition ("available" , "false" , "New Reason" , "Message" , middle , gen ),
119+ newCondition ("available" , "false" , "New Reason" , "Message" , gen ),
136120 },
137121 expected : []metav1.Condition {
138- newCondition ("available" , "false" , "New Reason" , "Message" , middle , gen ),
122+ newCondition ("available" , "false" , "New Reason" , "Message" , gen ),
139123 },
140124 },
141125 {
142126 name : "message updated" ,
143127 current : []metav1.Condition {
144- newCondition ("available" , "false" , "Reason" , "Message" , start , gen ),
128+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
145129 },
146130 updates : []metav1.Condition {
147- newCondition ("available" , "false" , "Reason" , "New Message" , middle , gen ),
131+ newCondition ("available" , "false" , "Reason" , "New Message" , gen ),
148132 },
149133 expected : []metav1.Condition {
150- newCondition ("available" , "false" , "Reason" , "New Message" , middle , gen ),
134+ newCondition ("available" , "false" , "Reason" , "New Message" , gen ),
151135 },
152136 },
153137 {
154138 name : "observed generation updated" ,
155139 current : []metav1.Condition {
156- newCondition ("available" , "false" , "Reason" , "Message" , start , gen ),
140+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
157141 },
158142 updates : []metav1.Condition {
159- newCondition ("available" , "false" , "Reason" , "Message" , middle , gen + 1 ),
143+ newCondition ("available" , "false" , "Reason" , "Message" , gen + 1 ),
160144 },
161145 expected : []metav1.Condition {
162- newCondition ("available" , "false" , "Reason" , "Message" , middle , gen + 1 ),
146+ newCondition ("available" , "false" , "Reason" , "Message" , gen + 1 ),
163147 },
164148 },
165149 {
166150 name : "status unchanged" ,
167151 current : []metav1.Condition {
168- newCondition ("available" , "false" , "Reason" , "Message" , start , gen ),
152+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
169153 },
170154 updates : []metav1.Condition {
171- newCondition ("available" , "false" , "Reason" , "Message" , middle , gen ),
155+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
172156 },
173157 expected : []metav1.Condition {
174- newCondition ("available" , "false" , "Reason" , "Message" , start , gen ),
158+ newCondition ("available" , "false" , "Reason" , "Message" , gen ),
175159 },
176160 },
177161 }
178162
179- // Simulate the passage of time between original condition creation
180- // and update processing
181- fakeClock .SetTime (later )
182-
183163 for _ , tc := range testCases {
184164 got := MergeConditions (tc .current , tc .updates ... )
185165 assert .ElementsMatch (t , tc .expected , got , tc .name )
@@ -188,7 +168,7 @@ func TestMergeConditions(t *testing.T) {
188168
189169func TestMergeConditionsTruncatesMessages (t * testing.T ) {
190170 longMsg := strings .Repeat ("x" , conditionMessageMaxLength + 5 )
191- cond := newCondition ("available" , metav1 .ConditionTrue , "Reason" , longMsg , time . Now (), 1 )
171+ cond := newCondition ("available" , metav1 .ConditionTrue , "Reason" , longMsg , 1 )
192172 conditions := MergeConditions (nil , cond )
193173
194174 if assert .Len (t , conditions , 1 ) {
0 commit comments