Skip to content

Commit 925f37c

Browse files
ZiyangLinScalityZiyangLinScality
committed
refactor(e2e): improve namespace deletion logging and handling in tests
- Updated logging messages to clarify the deletion process of namespaces across multiple test files. - Introduced checks to wait for namespace deletion completion, enhancing the reliability of cleanup operations. - Ensured consistent handling of namespace deletion across various end-to-end tests, improving overall test robustness.
1 parent 7bee8c9 commit 925f37c

File tree

7 files changed

+67
-13
lines changed

7 files changed

+67
-13
lines changed

‎test/e2e/cascade_gc_test.go‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,12 @@ func TestCascadeGC_ExposerUpdatesComponent(t *testing.T) {
203203
if err := client.Resources().Delete(ctx, ns); err != nil {
204204
t.Logf("Warning: Failed to delete namespace: %v", err)
205205
} else {
206-
t.Logf("Deleted namespace %s", namespace)
206+
t.Logf("Deleting namespace %s", namespace)
207+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
208+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
209+
} else {
210+
t.Logf("Namespace %s deleted", namespace)
211+
}
207212
}
208213

209214
return ctx
@@ -381,7 +386,12 @@ func TestCascadeGC_ExposerDeletionCleanup(t *testing.T) {
381386
if err := client.Resources().Delete(ctx, ns); err != nil {
382387
t.Logf("Warning: Failed to delete namespace: %v", err)
383388
} else {
384-
t.Logf("Deleted namespace %s", namespace)
389+
t.Logf("Deleting namespace %s", namespace)
390+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
391+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
392+
} else {
393+
t.Logf("Namespace %s deleted", namespace)
394+
}
385395
}
386396

387397
return ctx

‎test/e2e/e2e_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,12 @@ func TestSmokeFullChain(t *testing.T) {
268268
if err := client.Resources().Delete(ctx, ns); err != nil {
269269
t.Logf("Warning: Failed to delete namespace %s: %v", namespace, err)
270270
} else {
271-
t.Logf("Deleted namespace %s", namespace)
271+
t.Logf("Deleting namespace %s", namespace)
272+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
273+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
274+
} else {
275+
t.Logf("Namespace %s deleted", namespace)
276+
}
272277
}
273278

274279
return ctx

‎test/e2e/framework/mock_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (c *MockServerClient) ensureCurlPod(ctx context.Context, namespace string)
8686
"--image-pull-policy=IfNotPresent",
8787
"--command",
8888
"--",
89-
"sleep", "3600",
89+
"sleep", "300",
9090
}
9191
cmd := exec.CommandContext(ctx, "kubectl", args...)
9292
var stdout, stderr bytes.Buffer

‎test/e2e/multi_namespace_test.go‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,15 @@ func TestMultiNamespace_MultipleComponentsAggregation(t *testing.T) {
292292
if err := client.Resources().Delete(ctx, ns); err != nil {
293293
t.Logf("Warning: Failed to delete namespace %s: %v", nsName, err)
294294
} else {
295-
t.Logf("Deleted namespace %s", nsName)
295+
t.Logf("Deleting namespace %s", nsName)
296+
}
297+
}
298+
299+
for _, nsName := range []string{nsA, nsB} {
300+
if err := framework.WaitForNamespaceDeleted(ctx, client, nsName, framework.LongTimeout); err != nil {
301+
t.Logf("Warning: Namespace %s not fully deleted: %v", nsName, err)
302+
} else {
303+
t.Logf("Namespace %s deleted", nsName)
296304
}
297305
}
298306

@@ -560,7 +568,15 @@ func TestMultiNamespace_PartialNamespaceDeletion(t *testing.T) {
560568
if err := client.Resources().Delete(ctx, ns); err != nil {
561569
t.Logf("Warning: Failed to delete namespace %s: %v", nsName, err)
562570
} else {
563-
t.Logf("Deleted namespace %s", nsName)
571+
t.Logf("Deleting namespace %s", nsName)
572+
}
573+
}
574+
575+
for _, nsName := range []string{nsA, nsB} {
576+
if err := framework.WaitForNamespaceDeleted(ctx, client, nsName, framework.LongTimeout); err != nil {
577+
t.Logf("Warning: Namespace %s not fully deleted: %v", nsName, err)
578+
} else {
579+
t.Logf("Namespace %s deleted", nsName)
564580
}
565581
}
566582

‎test/e2e/namespace_deletion_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,12 @@ func TestNamespaceDeletion_CascadeCleanup(t *testing.T) {
191191
if err := client.Resources().Delete(ctx, ns); err != nil {
192192
t.Logf("Warning: Failed to delete namespace: %v", err)
193193
} else {
194-
t.Logf("Deleted namespace %s", namespace)
194+
t.Logf("Deleting namespace %s", namespace)
195+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
196+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
197+
} else {
198+
t.Logf("Namespace %s deleted", namespace)
199+
}
195200
}
196201

197202
return ctx

‎test/e2e/pod_lifecycle_test.go‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,12 @@ func TestPodLifecycle_RollingUpdateOnConfigChange(t *testing.T) {
203203
if err := client.Resources().Delete(ctx, ns); err != nil {
204204
t.Logf("Warning: Failed to delete namespace: %v", err)
205205
} else {
206-
t.Logf("Deleted namespace %s", namespace)
206+
t.Logf("Deleting namespace %s", namespace)
207+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
208+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
209+
} else {
210+
t.Logf("Namespace %s deleted", namespace)
211+
}
207212
}
208213

209214
return ctx
@@ -303,8 +308,6 @@ func TestPodLifecycle_OperatorCrashRecovery(t *testing.T) {
303308
componentName := ctx.Value(podLifecycleComponentKey).(string)
304309
exposerName := ctx.Value(podLifecycleExposerKey).(string)
305310

306-
time.Sleep(5 * time.Second)
307-
308311
if err := framework.WaitForScalityUIReady(ctx, client, scalityUIName, framework.DefaultTimeout); err != nil {
309312
t.Fatalf("ScalityUI not ready after recovery: %v", err)
310313
}
@@ -353,7 +356,12 @@ func TestPodLifecycle_OperatorCrashRecovery(t *testing.T) {
353356
if err := client.Resources().Delete(ctx, ns); err != nil {
354357
t.Logf("Warning: Failed to delete namespace: %v", err)
355358
} else {
356-
t.Logf("Deleted namespace %s", namespace)
359+
t.Logf("Deleting namespace %s", namespace)
360+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
361+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
362+
} else {
363+
t.Logf("Namespace %s deleted", namespace)
364+
}
357365
}
358366

359367
return ctx
@@ -535,7 +543,12 @@ func TestPodLifecycle_NoSpuriousUpdatesAfterRestart(t *testing.T) {
535543
if err := client.Resources().Delete(ctx, ns); err != nil {
536544
t.Logf("Warning: Failed to delete namespace: %v", err)
537545
} else {
538-
t.Logf("Deleted namespace %s", namespace)
546+
t.Logf("Deleting namespace %s", namespace)
547+
if err := framework.WaitForNamespaceDeleted(ctx, client, namespace, framework.LongTimeout); err != nil {
548+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
549+
} else {
550+
t.Logf("Namespace %s deleted", namespace)
551+
}
539552
}
540553

541554
return ctx

‎test/e2e/real_http_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,12 @@ func teardownNamespace(ctx context.Context, t *testing.T, cfg *envconf.Config) c
581581
if err := k8sClient.Resources().Delete(ctx, ns); err != nil {
582582
t.Logf("Warning: Failed to delete namespace %s: %v", namespace, err)
583583
} else {
584-
t.Logf("Deleted namespace %s", namespace)
584+
t.Logf("Deleting namespace %s", namespace)
585+
if err := framework.WaitForNamespaceDeleted(ctx, k8sClient, namespace, framework.LongTimeout); err != nil {
586+
t.Logf("Warning: Namespace %s not fully deleted: %v", namespace, err)
587+
} else {
588+
t.Logf("Namespace %s deleted", namespace)
589+
}
585590
}
586591

587592
return ctx

0 commit comments

Comments
 (0)