From d747aa6c3c59147c6a6597cf4529299db35c66bc Mon Sep 17 00:00:00 2001 From: Navid Shaikh Date: Fri, 10 Apr 2020 17:27:49 +0530 Subject: [PATCH 1/2] e2e: Foreground delete for revisions and services in e2e to avoid any race conditions and flakes --- test/e2e/basic_workflow_test.go | 2 +- test/e2e/revision_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/basic_workflow_test.go b/test/e2e/basic_workflow_test.go index 4d4ebdd3de..c1c8f308c5 100644 --- a/test/e2e/basic_workflow_test.go +++ b/test/e2e/basic_workflow_test.go @@ -131,7 +131,7 @@ func serviceUpdate(r *test.KnRunResultCollector, serviceName string, args ...str } func serviceDelete(r *test.KnRunResultCollector, serviceName string) { - out := r.KnTest().Kn().Run("service", "delete", serviceName) + out := r.KnTest().Kn().Run("service", "delete", "--no-wait=false", serviceName) r.AssertNoError(out) assert.Check(r.T(), util.ContainsAll(out.Stdout, "Service", serviceName, "successfully deleted in namespace", r.KnTest().Kn().Namespace())) } diff --git a/test/e2e/revision_test.go b/test/e2e/revision_test.go index 504cc68fd4..2e4d26d772 100644 --- a/test/e2e/revision_test.go +++ b/test/e2e/revision_test.go @@ -98,7 +98,7 @@ func revisionListWithService(r *test.KnRunResultCollector, serviceNames ...strin } func revisionDelete(r *test.KnRunResultCollector, revName string) { - out := r.KnTest().Kn().Run("revision", "delete", revName) + out := r.KnTest().Kn().Run("revision", "delete", "--no-wait=false", revName) assert.Check(r.T(), util.ContainsAll(out.Stdout, "Revision", revName, "deleted", "namespace", r.KnTest().Kn().Namespace())) r.AssertNoError(out) } From 93e497e6135dc77be9dfea42b39b8eb758f40f6c Mon Sep 17 00:00:00 2001 From: Navid Shaikh Date: Wed, 15 Apr 2020 01:09:50 +0530 Subject: [PATCH 2/2] Use --wait instead of --no-wait=false --- test/e2e/basic_workflow_test.go | 2 +- test/e2e/revision_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/basic_workflow_test.go b/test/e2e/basic_workflow_test.go index c1c8f308c5..fa37814118 100644 --- a/test/e2e/basic_workflow_test.go +++ b/test/e2e/basic_workflow_test.go @@ -131,7 +131,7 @@ func serviceUpdate(r *test.KnRunResultCollector, serviceName string, args ...str } func serviceDelete(r *test.KnRunResultCollector, serviceName string) { - out := r.KnTest().Kn().Run("service", "delete", "--no-wait=false", serviceName) + out := r.KnTest().Kn().Run("service", "delete", "--wait", serviceName) r.AssertNoError(out) assert.Check(r.T(), util.ContainsAll(out.Stdout, "Service", serviceName, "successfully deleted in namespace", r.KnTest().Kn().Namespace())) } diff --git a/test/e2e/revision_test.go b/test/e2e/revision_test.go index 2e4d26d772..bc8907cd34 100644 --- a/test/e2e/revision_test.go +++ b/test/e2e/revision_test.go @@ -98,7 +98,7 @@ func revisionListWithService(r *test.KnRunResultCollector, serviceNames ...strin } func revisionDelete(r *test.KnRunResultCollector, revName string) { - out := r.KnTest().Kn().Run("revision", "delete", "--no-wait=false", revName) + out := r.KnTest().Kn().Run("revision", "delete", "--wait", revName) assert.Check(r.T(), util.ContainsAll(out.Stdout, "Revision", revName, "deleted", "namespace", r.KnTest().Kn().Namespace())) r.AssertNoError(out) }