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

Update end to end tests to use shorter progress deadlines

This commit is contained in:
Preetha Appan 2018-04-30 16:46:34 -05:00
parent 738056634e
commit 6c09379bd7
No known key found for this signature in database
GPG Key ID: 9F7C19990A50EAFC
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e2e/rescheduling/input/rescheduling_maxp_autorevert.hcl
View File

@ -10,15 +10,16 @@ job "demo3" {
config { config {
command = "bash" command = "bash"
args = ["-c", "sleep 5000"] args = ["-c", "sleep 15000"]
} }
} }
update { update {
max_parallel = 1 max_parallel = 1
min_healthy_time = "1s" min_healthy_time = "1s"
healthy_deadline = "1m"
auto_revert = true auto_revert = true
healthy_deadline = "2s"
progress_deadline = "3s"
} }
restart { restart {

9
e2e/rescheduling/server_side_restarts_test.go
View File

@ -208,7 +208,7 @@ var _ = Describe("Server Side Restart Tests", func() {
}) })
Context("Reschedule with canary and auto revert ", func() { Context("Reschedule with canary, auto revert with short progress deadline ", func() {
BeforeEach(func() { BeforeEach(func() {
specFile = "input/rescheduling_canary_autorevert.hcl" specFile = "input/rescheduling_canary_autorevert.hcl"
}) })
@ -229,11 +229,10 @@ var _ = Describe("Server Side Restart Tests", func() {
// Wait for the revert // Wait for the revert
Eventually(allocStatuses, 3*time.Second, time.Second).Should( Eventually(allocStatuses, 3*time.Second, time.Second).Should(
ConsistOf([]string{"failed", "failed", "failed", "running", "running", "running"})) ConsistOf([]string{"failed", "failed", "failed", "running", "running", "running"}))
// Verify new deployment and its status // Verify new deployment and its status
// There should be one successful, one failed, and one more successful (after revert) // There should be one successful, one failed, and one more successful (after revert)
time.Sleep(5 * time.Second) //TODO(preetha) figure out why this wasn't working with ginkgo constructs time.Sleep(5 * time.Second) //TODO(preetha) figure out why this wasn't working with ginkgo constructs
Eventually(deploymentStatus(), 2*time.Second, time.Second).Should( Eventually(deploymentStatus(), 5*time.Second, time.Second).Should(
ConsistOf(structs.DeploymentStatusSuccessful, structs.DeploymentStatusFailed, structs.DeploymentStatusSuccessful)) ConsistOf(structs.DeploymentStatusSuccessful, structs.DeploymentStatusFailed, structs.DeploymentStatusSuccessful))
}) })
@ -272,7 +271,7 @@ var _ = Describe("Server Side Restart Tests", func() {
}) })
Context("Reschedule with max parallel and auto revert true ", func() { Context("Reschedule with max parallel, auto revert true and short progress deadline", func() {
BeforeEach(func() { BeforeEach(func() {
specFile = "input/rescheduling_maxp_autorevert.hcl" specFile = "input/rescheduling_maxp_autorevert.hcl"
}) })
@ -291,7 +290,7 @@ var _ = Describe("Server Side Restart Tests", func() {
Eventually(allocStatusesRescheduled, 2*time.Second, time.Second).Should(BeEmpty()) Eventually(allocStatusesRescheduled, 2*time.Second, time.Second).Should(BeEmpty())
// Wait for the revert // Wait for the revert
Eventually(allocStatuses, 3*time.Second, time.Second).Should( Eventually(allocStatuses, 5*time.Second, time.Second).Should(
ConsistOf([]string{"complete", "failed", "running", "running", "running"})) ConsistOf([]string{"complete", "failed", "running", "running", "running"}))
// Verify new deployment and its status // Verify new deployment and its status