luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

e2e/deployment DeploymentsForJob fail instead of nil, error passing

This commit is contained in:
Lang Martin 2019-06-04 14:31:42 -04:00
parent fa09e5d5f4
commit 071dccfcce
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e2e/deployment/deployment.go
View File

@ -1,6 +1,8 @@
package deployment
import (
"fmt"
"github.com/hashicorp/nomad/e2e/framework"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/testutil"
@ -40,23 +42,25 @@ func (tc *DeploymentTest) TestDeploymentAutoPromote(f *framework.F) {
jobId := "deployment" + uuid[0:8]
tc.jobIds = append(tc.jobIds, jobId)
e2eutil.RegisterAndWaitForAllocs(t, nomadClient, "deployment/input/deployment_auto0.nomad", jobId)
deploy := e2eutil.DeploymentsForJob(nomadClient, jobId)[0]
ds := e2eutil.DeploymentsForJob(t, nomadClient, jobId)
require.Equal(t, 1, len(ds))
deploy := ds[0]
// Upgrade
e2eutil.RegisterAllocs(t, nomadClient, "deployment/input/deployment_auto1.nomad", jobId)
// Find the deployment we don't already have
testutil.WaitForResult(func() (bool, error) {
ds := e2eutil.DeploymentsForJob(nomadClient, jobId)
ds = e2eutil.DeploymentsForJob(t, nomadClient, jobId)
for _, d := range ds {
if d.ID != deploy.ID {
deploy = d
return true, nil
}
}
return false, nil
return false, fmt.Errorf("missing update deployment for job %s", jobId)
}, func(e error) {
t.Error("missing update deployment")
require.NoError(t, e)
})
// Deployment is auto pending the upgrade of "two" which has a longer time to health

6
e2e/e2eutil/utils.go
View File

@ -111,11 +111,9 @@ func WaitForAllocRunning(t *testing.T, nomadClient *api.Client, allocID string)
})
}
func DeploymentsForJob(nomadClient *api.Client, jobID string) []*api.Deployment {
func DeploymentsForJob(t *testing.T, nomadClient *api.Client, jobID string) []*api.Deployment {
ds, _, err := nomadClient.Deployments().List(nil)
if err != nil {
return nil
}
require.NoError(t, err)
out := []*api.Deployment{}
for _, d := range ds {