Merge pull request #85 from arangodb/bug-fix/version-check-fix

ObiWahn · web-flow · commit 3f35016caadd · 2018-03-28T11:00:45.000+02:00
fix - /api/version will answer on all servers (not leader only)
diff --git a/tests/test_util.go b/tests/test_util.go
@@ -379,8 +379,10 @@ func waitUntilArangoDeploymentHealthy(deployment *api.ArangoDeployment, DBClient
 				}
 			}
 
-			if goodResults != 1 || noLeaderResults != *deployment.Spec.Single.Count-1 {
-				return maskAny(fmt.Errorf("Wrong number of results: good %d - noleader %d", goodResults, noLeaderResults))
+			expectedGood := *deployment.Spec.Single.Count
+			expectedNoLeader := 0
+			if goodResults != expectedGood || noLeaderResults != expectedNoLeader {
+				return maskAny(fmt.Errorf("Wrong number of results: good %d (expected: %d)- noleader %d (expected %d)", goodResults, expectedGood, noLeaderResults, expectedNoLeader))
 			}
 		}
 	default:

Original file line number	Diff line number	Diff line change
`@@ -379,8 +379,10 @@ func waitUntilArangoDeploymentHealthy(deployment *api.ArangoDeployment, DBClient`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`
`382`		`- if goodResults != 1 \|\| noLeaderResults != *deployment.Spec.Single.Count-1 {`
`383`		`- return maskAny(fmt.Errorf("Wrong number of results: good %d - noleader %d", goodResults, noLeaderResults))`
	`382`	`+ expectedGood := *deployment.Spec.Single.Count`
	`383`	`+ expectedNoLeader := 0`
	`384`	`+ if goodResults != expectedGood \|\| noLeaderResults != expectedNoLeader {`
	`385`	`+ return maskAny(fmt.Errorf("Wrong number of results: good %d (expected: %d)- noleader %d (expected %d)", goodResults, expectedGood, noLeaderResults, expectedNoLeader))`
`384`	`386`	`}`
`385`	`387`	`}`
`386`	`388`	`default:`