Merge pull request #22861 from smarterclayton/random

openshift-merge-robot · web-flow · commit c8a3fe28ce48 · 2019-05-19T11:29:37.000+02:00
Fix abort-at=random on upgrade tests
diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go
@@ -94,10 +94,11 @@ func SetUpgradeAbortAt(policy string) error {
 	}
 	if policy == "random" {
 		upgradeAbortAt = upgradeAbortAtRandom
+		return nil
 	}
 	if val, err := strconv.Atoi(policy); err == nil {
 		if val < 0 || val > 100 {
-			return fmt.Errorf("abort-at must be empty or an integer in [0,100], inclusive")
+			return fmt.Errorf("abort-at must be empty, set to 'random', or an integer in [0,100], inclusive")
 		}
 		if val == 0 {
 			upgradeAbortAt = 1
@@ -106,7 +107,7 @@ func SetUpgradeAbortAt(policy string) error {
 		}
 		return nil
 	}
-	return fmt.Errorf("abort-at must be empty or an integer in [0,100], inclusive")
+	return fmt.Errorf("abort-at must be empty, set to 'random', or an integer in [0,100], inclusive")
 }
 
 var _ = g.Describe("[Disruptive]", func() {

Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,11 @@ func SetUpgradeAbortAt(policy string) error {`
`94`	`94`	`}`
`95`	`95`	`if policy == "random" {`
`96`	`96`	`upgradeAbortAt = upgradeAbortAtRandom`
	`97`	`+ return nil`
`97`	`98`	`}`
`98`	`99`	`if val, err := strconv.Atoi(policy); err == nil {`
`99`	`100`	`if val < 0 \|\| val > 100 {`
`100`		`- return fmt.Errorf("abort-at must be empty or an integer in [0,100], inclusive")`
	`101`	`+ return fmt.Errorf("abort-at must be empty, set to 'random', or an integer in [0,100], inclusive")`
`101`	`102`	`}`
`102`	`103`	`if val == 0 {`
`103`	`104`	`upgradeAbortAt = 1`
`@@ -106,7 +107,7 @@ func SetUpgradeAbortAt(policy string) error {`
`106`	`107`	`}`
`107`	`108`	`return nil`
`108`	`109`	`}`
`109`		`- return fmt.Errorf("abort-at must be empty or an integer in [0,100], inclusive")`
	`110`	`+ return fmt.Errorf("abort-at must be empty, set to 'random', or an integer in [0,100], inclusive")`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`var _ = g.Describe("[Disruptive]", func() {`