From 43b75b0775c712fbeb2edf7d4c99e11d8519e8b5 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Tue, 17 Sep 2019 08:29:25 +0200 Subject: [PATCH 1/2] Improve e2e test with waiting enhancement --- test/e2e/configuration_test.go | 21 ++++++++++++++++----- test/e2e/restorebackup_test.go | 15 ++++++++++++++- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 7802500f..3404d093 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -3,15 +3,15 @@ package e2e import ( "context" "fmt" - "testing" - "time" - + "github.com/jenkinsci/kubernetes-operator/internal/try" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" - "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" + "testing" + "time" "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" @@ -129,7 +129,18 @@ func TestPlugins(t *testing.T) { i, err := job.InvokeSimple(map[string]string{}) require.NoError(t, err, i) - time.Sleep(time.Minute * 2) + time.Sleep(time.Second * 5) + err = try.Until(func() (end bool, err error) { + running, _ := job.IsRunning() + queued, _ := job.IsQueued() + + if !running && !queued { + return true, nil + } + + return false, nil + }, time.Second*5, time.Minute*2) + require.NoError(t, err) job, err = jenkinsClient.GetJob(jobID) require.NoError(t, err, job) diff --git a/test/e2e/restorebackup_test.go b/test/e2e/restorebackup_test.go index 475e3292..5c0cb010 100644 --- a/test/e2e/restorebackup_test.go +++ b/test/e2e/restorebackup_test.go @@ -36,7 +36,20 @@ func TestBackupAndRestore(t *testing.T) { require.NoError(t, err, job) i, err := job.InvokeSimple(map[string]string{}) require.NoError(t, err, i) - time.Sleep(60 * time.Second) // wait for the build to complete + + time.Sleep(time.Second * 10) + err = try.Until(func() (end bool, err error) { + t.Log("Running job...") + running, _ := job.IsRunning() + queued, _ := job.IsQueued() + + if !running && !queued { + return true, nil + } + + return false, nil + }, time.Second*10, time.Minute*2) + require.NoError(t, err) restartJenkinsMasterPod(t, jenkins) waitForRecreateJenkinsMasterPod(t, jenkins) From aeed89f3b002262e8f2d528dc77583a13741d9f8 Mon Sep 17 00:00:00 2001 From: Jakub Al-Khalili Date: Tue, 17 Sep 2019 13:29:42 +0200 Subject: [PATCH 2/2] Improve e2e tests - add waitForJobToFinish --- test/e2e/configuration_test.go | 19 ++++--------------- test/e2e/restorebackup_test.go | 16 ++-------------- test/e2e/wait.go | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index 3404d093..d5147a4f 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -3,15 +3,15 @@ package e2e import ( "context" "fmt" - "github.com/jenkinsci/kubernetes-operator/internal/try" + "testing" + "time" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" jenkinsclient "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/client" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/configuration/base/resources" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/groovy" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" - "testing" - "time" "github.com/bndr/gojenkins" framework "github.com/operator-framework/operator-sdk/pkg/test" @@ -129,18 +129,7 @@ func TestPlugins(t *testing.T) { i, err := job.InvokeSimple(map[string]string{}) require.NoError(t, err, i) - time.Sleep(time.Second * 5) - err = try.Until(func() (end bool, err error) { - running, _ := job.IsRunning() - queued, _ := job.IsQueued() - - if !running && !queued { - return true, nil - } - - return false, nil - }, time.Second*5, time.Minute*2) - require.NoError(t, err) + waitForJobToFinish(t, job, 2 * time.Second, 2 * time.Minute) job, err = jenkinsClient.GetJob(jobID) require.NoError(t, err, job) diff --git a/test/e2e/restorebackup_test.go b/test/e2e/restorebackup_test.go index 5c0cb010..6ce36383 100644 --- a/test/e2e/restorebackup_test.go +++ b/test/e2e/restorebackup_test.go @@ -36,20 +36,8 @@ func TestBackupAndRestore(t *testing.T) { require.NoError(t, err, job) i, err := job.InvokeSimple(map[string]string{}) require.NoError(t, err, i) - - time.Sleep(time.Second * 10) - err = try.Until(func() (end bool, err error) { - t.Log("Running job...") - running, _ := job.IsRunning() - queued, _ := job.IsQueued() - - if !running && !queued { - return true, nil - } - - return false, nil - }, time.Second*10, time.Minute*2) - require.NoError(t, err) + // FIXME: waitForJobToFinish use + time.Sleep(60 * time.Second) // wait for the build to complete restartJenkinsMasterPod(t, jenkins) waitForRecreateJenkinsMasterPod(t, jenkins) diff --git a/test/e2e/wait.go b/test/e2e/wait.go index 431d55f6..cd7afc04 100644 --- a/test/e2e/wait.go +++ b/test/e2e/wait.go @@ -2,6 +2,7 @@ package e2e import ( goctx "context" + "github.com/bndr/gojenkins" "net/http" "testing" "time" @@ -29,6 +30,28 @@ var ( // checkConditionFunc is used to check if a condition for the jenkins CR is set type checkConditionFunc func(*v1alpha2.Jenkins, error) bool +func waitForJobToFinish(t *testing.T, job *gojenkins.Job, tick, timeout time.Duration) { + err := try.Until(func() (end bool, err error) { + t.Logf("Waiting for job `%s` to finish", job.GetName()) + running, err := job.IsRunning() + if err != nil { + return false, err + } + + queued, err := job.IsQueued() + if err != nil { + return false, err + } + + if !running && !queued { + return true, nil + } + + return false, nil + }, tick, timeout) + require.NoError(t, err) +} + func waitForJenkinsBaseConfigurationToComplete(t *testing.T, jenkins *v1alpha2.Jenkins) { t.Log("Waiting for Jenkins base configuration to complete") _, err := WaitUntilJenkinsConditionSet(retryInterval, 150, jenkins, func(jenkins *v1alpha2.Jenkins, err error) bool {