Skip to content

Commit a6133b3

Browse files
htemelski-osshtemelski-oss
committed
disabled majority of tests, swapped event order
1 parent 4287b8b commit a6133b3

File tree

5 files changed

+68
-68
lines changed

5 files changed

+68
-68
lines changed

‎maintnotifications/e2e/scenario_endpoint_types_test.go‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
4444
endpointType: maintnotifications.EndpointTypeExternalIP,
4545
description: "External IP endpoint type for enterprise clusters",
4646
},
47-
{
48-
name: "ExternalFQDN",
49-
endpointType: maintnotifications.EndpointTypeExternalFQDN,
50-
description: "External FQDN endpoint type for DNS-based routing",
51-
},
52-
{
53-
name: "None",
54-
endpointType: maintnotifications.EndpointTypeNone,
55-
description: "No endpoint type - reconnect with current config",
56-
},
47+
// {
48+
// name: "ExternalFQDN",
49+
// endpointType: maintnotifications.EndpointTypeExternalFQDN,
50+
// description: "External FQDN endpoint type for DNS-based routing",
51+
// },
52+
// {
53+
// name: "None",
54+
// endpointType: maintnotifications.EndpointTypeNone,
55+
// description: "No endpoint type - reconnect with current config",
56+
// },
5757
}
5858

5959
defer func() {
@@ -159,56 +159,6 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
159159
commandsRunner.Stop()
160160
}()
161161

162-
// Test failover with this endpoint type
163-
p("Testing failover with %s endpoint type...", endpointTest.name)
164-
failoverResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
165-
Type: "failover",
166-
Parameters: map[string]interface{}{
167-
"cluster_index": "0",
168-
"bdb_id": endpointConfig.BdbID,
169-
},
170-
})
171-
if err != nil {
172-
t.Fatalf("Failed to trigger failover action for %s: %v", endpointTest.name, err)
173-
}
174-
175-
// Start command traffic
176-
go func() {
177-
commandsRunner.FireCommandsUntilStop(ctx)
178-
}()
179-
180-
// Wait for FAILING_OVER notification
181-
match, found := logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
182-
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "FAILING_OVER")
183-
}, 2*time.Minute)
184-
if !found {
185-
t.Fatalf("FAILING_OVER notification was not received for %s endpoint type", endpointTest.name)
186-
}
187-
failingOverData := logs2.ExtractDataFromLogMessage(match)
188-
p("FAILING_OVER notification received for %s. %v", endpointTest.name, failingOverData)
189-
190-
// Wait for FAILED_OVER notification
191-
seqIDToObserve := int64(failingOverData["seqID"].(float64))
192-
connIDToObserve := uint64(failingOverData["connID"].(float64))
193-
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
194-
return notificationType(s, "FAILED_OVER") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
195-
}, 2*time.Minute)
196-
if !found {
197-
t.Fatalf("FAILED_OVER notification was not received for %s endpoint type", endpointTest.name)
198-
}
199-
failedOverData := logs2.ExtractDataFromLogMessage(match)
200-
p("FAILED_OVER notification received for %s. %v", endpointTest.name, failedOverData)
201-
202-
// Wait for failover to complete
203-
status, err := faultInjector.WaitForAction(ctx, failoverResp.ActionID,
204-
WithMaxWaitTime(120*time.Second),
205-
WithPollInterval(1*time.Second),
206-
)
207-
if err != nil {
208-
t.Fatalf("[FI] Failover action failed for %s: %v", endpointTest.name, err)
209-
}
210-
p("[FI] Failover action completed for %s: %s", endpointTest.name, status.Status)
211-
212162
// Test migration with this endpoint type
213163
p("Testing migration with %s endpoint type...", endpointTest.name)
214164
migrateResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
@@ -222,7 +172,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
222172
}
223173

224174
// Wait for MIGRATING notification
225-
match, found = logCollector.WaitForLogMatchFunc(func(s string) bool {
175+
match, found := logCollector.WaitForLogMatchFunc(func(s string) bool {
226176
return strings.Contains(s, logs2.ProcessingNotificationMessage) && strings.Contains(s, "MIGRATING")
227177
}, 30*time.Second)
228178
if !found {
@@ -232,7 +182,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
232182
p("MIGRATING notification received for %s: %v", endpointTest.name, migrateData)
233183

234184
// Wait for migration to complete
235-
status, err = faultInjector.WaitForAction(ctx, migrateResp.ActionID,
185+
status, err := faultInjector.WaitForAction(ctx, migrateResp.ActionID,
236186
WithMaxWaitTime(120*time.Second),
237187
WithPollInterval(1*time.Second),
238188
)
@@ -242,8 +192,8 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
242192
p("[FI] Migrate action completed for %s: %s", endpointTest.name, status.Status)
243193

244194
// Wait for MIGRATED notification
245-
seqIDToObserve = int64(migrateData["seqID"].(float64))
246-
connIDToObserve = uint64(migrateData["connID"].(float64))
195+
seqIDToObserve := int64(migrateData["seqID"].(float64))
196+
connIDToObserve := uint64(migrateData["connID"].(float64))
247197
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
248198
return notificationType(s, "MIGRATED") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
249199
}, 2*time.Minute)
@@ -326,6 +276,56 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
326276
}
327277
p("Bind action completed for %s: %s", endpointTest.name, bindStatus.Status)
328278

279+
// Test failover with this endpoint type
280+
p("Testing failover with %s endpoint type...", endpointTest.name)
281+
failoverResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
282+
Type: "failover",
283+
Parameters: map[string]interface{}{
284+
"cluster_index": "0",
285+
"bdb_id": endpointConfig.BdbID,
286+
},
287+
})
288+
if err != nil {
289+
t.Fatalf("Failed to trigger failover action for %s: %v", endpointTest.name, err)
290+
}
291+
292+
// Start command traffic
293+
go func() {
294+
commandsRunner.FireCommandsUntilStop(ctx)
295+
}()
296+
297+
// Wait for FAILING_OVER notification
298+
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
299+
return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "FAILING_OVER")
300+
}, 2*time.Minute)
301+
if !found {
302+
t.Fatalf("FAILING_OVER notification was not received for %s endpoint type", endpointTest.name)
303+
}
304+
failingOverData := logs2.ExtractDataFromLogMessage(match)
305+
p("FAILING_OVER notification received for %s. %v", endpointTest.name, failingOverData)
306+
307+
// Wait for FAILED_OVER notification
308+
seqIDToObserve = int64(failingOverData["seqID"].(float64))
309+
connIDToObserve = uint64(failingOverData["connID"].(float64))
310+
match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
311+
return notificationType(s, "FAILED_OVER") && connID(s, connIDToObserve) && seqID(s, seqIDToObserve+1)
312+
}, 2*time.Minute)
313+
if !found {
314+
t.Fatalf("FAILED_OVER notification was not received for %s endpoint type", endpointTest.name)
315+
}
316+
failedOverData := logs2.ExtractDataFromLogMessage(match)
317+
p("FAILED_OVER notification received for %s. %v", endpointTest.name, failedOverData)
318+
319+
// Wait for failover to complete
320+
status, err = faultInjector.WaitForAction(ctx, failoverResp.ActionID,
321+
WithMaxWaitTime(120*time.Second),
322+
WithPollInterval(1*time.Second),
323+
)
324+
if err != nil {
325+
t.Fatalf("[FI] Failover action failed for %s: %v", endpointTest.name, err)
326+
}
327+
p("[FI] Failover action completed for %s: %s", endpointTest.name, status.Status)
328+
329329
// Continue traffic for analysis
330330
time.Sleep(30 * time.Second)
331331
commandsRunner.Stop()

‎maintnotifications/e2e/scenario_push_notifications_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
// TestPushNotifications tests Redis Enterprise push notifications (MOVING, MIGRATING, MIGRATED)
17-
func TestPushNotifications(t *testing.T) {
17+
func _TestPushNotifications(t *testing.T) {
1818
if os.Getenv("E2E_SCENARIO_TESTS") != "true" {
1919
t.Skip("Scenario tests require E2E_SCENARIO_TESTS=true")
2020
}

‎maintnotifications/e2e/scenario_stress_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
// TestStressPushNotifications tests push notifications under extreme stress conditions
17-
func TestStressPushNotifications(t *testing.T) {
17+
func _TestStressPushNotifications(t *testing.T) {
1818
if os.Getenv("E2E_SCENARIO_TESTS") != "true" {
1919
t.Skip("Scenario tests require E2E_SCENARIO_TESTS=true")
2020
}

‎maintnotifications/e2e/scenario_timeout_configs_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
// TestTimeoutConfigurationsPushNotifications tests push notifications with different timeout configurations
17-
func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
17+
func _TestTimeoutConfigurationsPushNotifications(t *testing.T) {
1818
if os.Getenv("E2E_SCENARIO_TESTS") != "true" {
1919
t.Skip("Scenario tests require E2E_SCENARIO_TESTS=true")
2020
}

‎maintnotifications/e2e/scenario_tls_configs_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
// TODO ADD TLS CONFIGS
1717
// TestTLSConfigurationsPushNotifications tests push notifications with different TLS configurations
18-
func TestTLSConfigurationsPushNotifications(t *testing.T) {
18+
func _TestTLSConfigurationsPushNotifications(t *testing.T) {
1919
if os.Getenv("E2E_SCENARIO_TESTS") != "true" {
2020
t.Skip("Scenario tests require E2E_SCENARIO_TESTS=true")
2121
}

0 commit comments

Comments
 (0)