Reload apiobject after cluster ok, to ensure we have all member state

Author: ewoutp

tests/resilience_test.go

@@ -37,8 +37,7 @@ func TestResiliencePod(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	apiObject, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
-	if err != nil {
+	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -53,6 +52,12 @@ func TestResiliencePod(t *testing.T) {
 		t.Fatalf("Cluster not running in expected health in time: %v", err)
 	}
 
+	// Fetch latest status so we know all member details
+	apiObject, err = c.DatabaseV1alpha().ArangoDeployments(ns).Get(depl.GetName(), metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Failed to get deployment: %v", err)
+	}
+
 	// Delete one pod after the other
 	apiObject.ForeachServerGroup(func(group api.ServerGroup, spec api.ServerGroupSpec, status *api.MemberStatusList) error {
 		for _, m := range *status {
@@ -112,8 +117,7 @@ func TestResiliencePVC(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	apiObject, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
-	if err != nil {
+	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -128,6 +132,12 @@ func TestResiliencePVC(t *testing.T) {
 		t.Fatalf("Cluster not running in expected health in time: %v", err)
 	}
 
+	// Fetch latest status so we know all member details
+	apiObject, err = c.DatabaseV1alpha().ArangoDeployments(ns).Get(depl.GetName(), metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Failed to get deployment: %v", err)
+	}
+
 	// Delete one pvc after the other
 	apiObject.ForeachServerGroup(func(group api.ServerGroup, spec api.ServerGroupSpec, status *api.MemberStatusList) error {
 		for _, m := range *status {
@@ -187,8 +197,7 @@ func TestResilienceService(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	apiObject, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
-	if err != nil {
+	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -203,6 +212,12 @@ func TestResilienceService(t *testing.T) {
 		t.Fatalf("Cluster not running in expected health in time: %v", err)
 	}
 
+	// Fetch latest status so we know all member details
+	apiObject, err = c.DatabaseV1alpha().ArangoDeployments(ns).Get(depl.GetName(), metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Failed to get deployment: %v", err)
+	}
+
 	// Delete database service
 	// Get current pod so we can compare UID later
 	serviceName := apiObject.Status.ServiceName