Skip to content

Commit 87670b2

Browse files
committed
increase waiting for notifications
1 parent 75ae204 commit 87670b2

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

maintnotifications/e2e/scenario_endpoint_types_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
189189
// Wait for FAILING_OVER notification
190190
match, found := logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
191191
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "FAILING_OVER")
192-
}, 2*time.Minute)
192+
}, 3*time.Minute)
193193
if !found {
194194
ef("FAILING_OVER notification was not received for %s endpoint type", endpointTest.name)
195195
}
@@ -201,7 +201,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
201201
connIDToObserve := uint64(failingOverData["connID"].(float64))
202202
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
203203
return notificationType(s, "FAILED_OVER") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
204-
}, 2*time.Minute)
204+
}, 3*time.Minute)
205205
if !found {
206206
ef("FAILED_OVER notification was not received for %s endpoint type", endpointTest.name)
207207
}
@@ -255,7 +255,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
255255
connIDToObserve = uint64(migrateData["connID"].(float64))
256256
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
257257
return notificationType(s, "MIGRATED") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
258-
}, 2*time.Minute)
258+
}, 3*time.Minute)
259259
if !found {
260260
ef("MIGRATED notification was not received for %s endpoint type", endpointTest.name)
261261
}
@@ -277,7 +277,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
277277
// Wait for MOVING notification
278278
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
279279
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "MOVING")
280-
}, 2*time.Minute)
280+
}, 3*time.Minute)
281281
if !found {
282282
ef("MOVING notification was not received for %s endpoint type", endpointTest.name)
283283
}

maintnotifications/e2e/scenario_push_notifications_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestPushNotifications(t *testing.T) {
157157
p("Waiting for FAILING_OVER notification")
158158
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
159159
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "FAILING_OVER")
160-
}, 2*time.Minute)
160+
}, 3*time.Minute)
161161
commandsRunner.Stop()
162162
}()
163163
commandsRunner.FireCommandsUntilStop(ctx)
@@ -172,7 +172,7 @@ func TestPushNotifications(t *testing.T) {
172172
p("Waiting for FAILED_OVER notification on conn %d with seqID %d...", connIDToObserve, seqIDToObserve+1)
173173
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
174174
return notificationType(s, "FAILED_OVER") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
175-
}, 2*time.Minute)
175+
}, 3*time.Minute)
176176
commandsRunner.Stop()
177177
}()
178178
commandsRunner.FireCommandsUntilStop(ctx)
@@ -232,7 +232,7 @@ func TestPushNotifications(t *testing.T) {
232232
p("Waiting for MIGRATED notification on conn %d with seqID %d...", connIDToObserve, seqIDToObserve+1)
233233
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
234234
return notificationType(s, "MIGRATED") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
235-
}, 2*time.Minute)
235+
}, 3*time.Minute)
236236
commandsRunner.Stop()
237237
}()
238238
commandsRunner.FireCommandsUntilStop(ctx)
@@ -299,7 +299,7 @@ func TestPushNotifications(t *testing.T) {
299299
p("Waiting for MOVING notification on second client")
300300
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
301301
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "MOVING")
302-
}, 2*time.Minute)
302+
}, 3*time.Minute)
303303
commandsRunner.Stop()
304304
// once moving is received, start a second client commands runner
305305
p("Starting commands on second client")
@@ -315,7 +315,7 @@ func TestPushNotifications(t *testing.T) {
315315
// also validate big enough relaxed timeout
316316
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
317317
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "MOVING") && connID(s, 18)
318-
}, 2*time.Minute)
318+
}, 3*time.Minute)
319319
if !found {
320320
errChan <- fmt.Errorf("MOVING notification was not received within 2 minutes ON A SECOND CLIENT")
321321
return
@@ -325,7 +325,7 @@ func TestPushNotifications(t *testing.T) {
325325
// wait for relaxation of 30m
326326
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
327327
return strings.Contains(s, logs2.ApplyingRelaxedTimeoutDueToPostHandoffMessage) && strings.Contains(s, "30m")
328-
}, 2*time.Minute)
328+
}, 3*time.Minute)
329329
if !found {
330330
errChan <- fmt.Errorf("relaxed timeout was not applied within 2 minutes ON A SECOND CLIENT")
331331
return

maintnotifications/e2e/scenario_timeout_configs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
4242
{
4343
name: "Conservative",
4444
handoffTimeout: 60 * time.Second,
45-
relaxedTimeout: 60 * time.Second,
45+
relaxedTimeout: 30 * time.Second,
4646
postHandoffRelaxedDuration: 2 * time.Minute,
4747
description: "Conservative timeouts for stable environments",
4848
expectedBehavior: "Longer timeouts, fewer timeout errors",
@@ -293,7 +293,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
293293
// waiting for moving notification
294294
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
295295
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "MOVING")
296-
}, 2*time.Minute)
296+
}, 3*time.Minute)
297297
if !found {
298298
ef("MOVING notification was not received for %s timeout config", timeoutTest.name)
299299
}

maintnotifications/e2e/scenario_tls_configs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func ТestTLSConfigurationsPushNotifications(t *testing.T) {
208208
// Wait for FAILING_OVER notification
209209
match, found := logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
210210
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "FAILING_OVER")
211-
}, 2*time.Minute)
211+
}, 3*time.Minute)
212212
if !found {
213213
ef("FAILING_OVER notification was not received for %s TLS config", tlsTest.name)
214214
}
@@ -220,7 +220,7 @@ func ТestTLSConfigurationsPushNotifications(t *testing.T) {
220220
connIDToObserve := uint64(failingOverData["connID"].(float64))
221221
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
222222
return notificationType(s, "FAILED_OVER") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
223-
}, 2*time.Minute)
223+
}, 3*time.Minute)
224224
if !found {
225225
ef("FAILED_OVER notification was not received for %s TLS config", tlsTest.name)
226226
}

0 commit comments

Comments
 (0)