From 4e3ad41c0b5e5f347fe36eb218f9b18a0ef68b2c Mon Sep 17 00:00:00 2001 From: Ionut Balutoiu Date: Thu, 24 Aug 2023 16:04:10 +0300 Subject: [PATCH] Fix `waitPoolRunningIdleInstances` function The variable `runningIdleCount` would get incremented for instances on every pool, instead of only for the pool we are interested in. This change fixes this. Also, adjust the logging message when error occurs in this timeout exceeded scenario. Signed-off-by: Ionut Balutoiu --- test/integration/e2e/instances.go | 6 ++++-- test/integration/e2e/organizations.go | 4 ++-- test/integration/e2e/repositories.go | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/integration/e2e/instances.go b/test/integration/e2e/instances.go index 1f078dc2..7c798851 100644 --- a/test/integration/e2e/instances.go +++ b/test/integration/e2e/instances.go @@ -88,9 +88,11 @@ func waitPoolRunningIdleInstances(poolID string, timeout time.Duration) error { poolInstances = make(params.Instances, 0) runningIdleCount := 0 for _, instance := range instances { - if instance.PoolID == poolID { - poolInstances = append(poolInstances, instance) + if instance.PoolID != poolID { + continue } + // current instance belongs to the pool we are waiting for + poolInstances = append(poolInstances, instance) if instance.Status == commonParams.InstanceRunning && instance.RunnerStatus == params.RunnerIdle { runningIdleCount++ } diff --git a/test/integration/e2e/organizations.go b/test/integration/e2e/organizations.go index 2fbc9db7..f3c4437e 100644 --- a/test/integration/e2e/organizations.go +++ b/test/integration/e2e/organizations.go @@ -102,9 +102,8 @@ func WaitOrgRunningIdleInstances(orgID string, timeout time.Duration) { } func dumpOrgInstancesDetails(orgID string) error { - log.Printf("Dumping org %s instances details", orgID) - // print org details + log.Printf("Dumping org %s details", orgID) org, err := getOrg(cli, authToken, orgID) if err != nil { return err @@ -114,6 +113,7 @@ func dumpOrgInstancesDetails(orgID string) error { } // print org instances details + log.Printf("Dumping org %s instances details", orgID) instances, err := listOrgInstances(cli, authToken, orgID) if err != nil { return err diff --git a/test/integration/e2e/repositories.go b/test/integration/e2e/repositories.go index fad22a76..8ce5c6d6 100644 --- a/test/integration/e2e/repositories.go +++ b/test/integration/e2e/repositories.go @@ -103,9 +103,8 @@ func WaitRepoRunningIdleInstances(repoID string, timeout time.Duration) { } func dumpRepoInstancesDetails(repoID string) error { - log.Printf("Dumping repo %s instances details", repoID) - // print repo details + log.Printf("Dumping repo %s details", repoID) repo, err := getRepo(cli, authToken, repoID) if err != nil { return err @@ -115,6 +114,7 @@ func dumpRepoInstancesDetails(repoID string) error { } // print repo instances details + log.Printf("Dumping repo %s instances details", repoID) instances, err := listRepoInstances(cli, authToken, repoID) if err != nil { return err