Updated tests

ewoutp · ewoutp · commit c9fdc98f4373 · 2018-03-27T15:53:02.000+02:00
diff --git a/tests/auth_test.go b/tests/auth_test.go
@@ -35,7 +35,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -88,7 +88,7 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -134,7 +134,7 @@ func TestAuthenticationNoneSingle(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -171,7 +171,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -224,7 +224,7 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -270,7 +270,7 @@ func TestAuthenticationNoneCluster(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
diff --git a/tests/deployments_test.go b/tests/deployments_test.go
@@ -87,7 +87,7 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage
 	}
 
 	// Wait for deployment to be ready
-	deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentHasState(api.DeploymentStateRunning))
+	deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
 	if err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
diff --git a/tests/immutable_test.go b/tests/immutable_test.go
@@ -56,7 +56,7 @@ func TestImmutableFields(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
diff --git a/tests/predicates.go b/tests/predicates.go
@@ -28,12 +28,16 @@ import (
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
 )
 
-// deploymentHasState creates a predicate that returns nil when the deployment has the given state.
-func deploymentHasState(state api.DeploymentState) func(*api.ArangoDeployment) error {
+// deploymentIsReady creates a predicate that returns nil when the deployment is in
+// the running phase and the `Ready` condition is true.
+func deploymentIsReady() func(*api.ArangoDeployment) error {
 	return func(obj *api.ArangoDeployment) error {
-		if obj.Status.State == state {
+		if obj.Status.Phase != api.DeploymentPhaseRunning {
+			return fmt.Errorf("Expected Running phase, got %s", obj.Status.Phase)
+		}
+		if obj.Status.Conditions.IsTrue(api.ConditionTypeReady) {
 			return nil
 		}
-		return fmt.Errorf("Expected state %s, got %s", state, obj.Status.State)
+		return fmt.Errorf("Expected Ready condition to be set, it is not")
 	}
 }
diff --git a/tests/resilience_test.go b/tests/resilience_test.go
@@ -37,7 +37,7 @@ func TestResiliencePod(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -117,7 +117,7 @@ func TestResiliencePVC(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -201,7 +201,7 @@ func TestResilienceService(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
diff --git a/tests/rocksdb_encryption_test.go b/tests/rocksdb_encryption_test.go
@@ -44,7 +44,7 @@ func TestRocksDBEncryptionSingle(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
+	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
 	if err != nil {
 		t.Errorf("Deployment not running in time: %v", err)
 	}
diff --git a/tests/scale_test.go b/tests/scale_test.go
@@ -34,7 +34,7 @@ func TestScaleClusterNonTLS(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
@@ -104,7 +104,7 @@ func TestScaleCluster(t *testing.T) {
 	}
 
 	// Wait for deployment to be ready
-	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {
+	if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
 
diff --git a/tests/simple_test.go b/tests/simple_test.go
@@ -32,7 +32,7 @@ func TestSimpleSingle(t *testing.T) {
 	defer removeDeployment(c, depl.GetName(), ns)
 
 	// Wait for deployment to be ready
-	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
+	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
 	if err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
@@ -73,7 +73,7 @@ func TestSimpleResilientSingle(t *testing.T) {
 	defer removeDeployment(c, depl.GetName(), ns)
 
 	// Wait for deployment to be ready
-	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
+	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
 	if err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}
@@ -114,7 +114,7 @@ func TestSimpleCluster(t *testing.T) {
 	defer removeDeployment(c, depl.GetName(), ns)
 
 	// Wait for deployment to be ready
-	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))
+	apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
 	if err != nil {
 		t.Fatalf("Deployment not running in time: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Wait for deployment to be ready`
`38`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`38`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`39`	`39`	`t.Fatalf("Deployment not running in time: %v", err)`
`40`	`40`	`}`
`41`	`41`
`@@ -88,7 +88,7 @@ func TestAuthenticationSingleCustomSecret(t *testing.T) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// Wait for deployment to be ready`
`91`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`91`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`92`	`92`	`t.Fatalf("Deployment not running in time: %v", err)`
`93`	`93`	`}`
`94`	`94`
`@@ -134,7 +134,7 @@ func TestAuthenticationNoneSingle(t *testing.T) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Wait for deployment to be ready`
`137`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`137`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`138`	`138`	`t.Fatalf("Deployment not running in time: %v", err)`
`139`	`139`	`}`
`140`	`140`
`@@ -171,7 +171,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`// Wait for deployment to be ready`
`174`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`174`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`175`	`175`	`t.Fatalf("Deployment not running in time: %v", err)`
`176`	`176`	`}`
`177`	`177`
`@@ -224,7 +224,7 @@ func TestAuthenticationClusterCustomSecret(t *testing.T) {`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`// Wait for deployment to be ready`
`227`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`227`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`228`	`228`	`t.Fatalf("Deployment not running in time: %v", err)`
`229`	`229`	`}`
`230`	`230`
`@@ -270,7 +270,7 @@ func TestAuthenticationNoneCluster(t *testing.T) {`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`// Wait for deployment to be ready`
`273`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`273`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`274`	`274`	`t.Fatalf("Deployment not running in time: %v", err)`
`275`	`275`	`}`
`276`	`276`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// Wait for deployment to be ready`
`90`		`- deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentHasState(api.DeploymentStateRunning))`
	`90`	`+ deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())`
`91`	`91`	`if err != nil {`
`92`	`92`	`t.Fatalf("Deployment not running in time: %v", err)`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func TestImmutableFields(t *testing.T) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`// Wait for deployment to be ready`
`59`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`59`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`60`	`60`	`t.Fatalf("Deployment not running in time: %v", err)`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,16 @@ import (`
`28`	`28`	`api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"`
`29`	`29`	`)`
`30`	`30`
`31`		`-// deploymentHasState creates a predicate that returns nil when the deployment has the given state.`
`32`		`-func deploymentHasState(state api.DeploymentState) func(*api.ArangoDeployment) error {`
	`31`	`+// deploymentIsReady creates a predicate that returns nil when the deployment is in`
	`32`	+// the running phase and the `Ready` condition is true.
	`33`	`+func deploymentIsReady() func(*api.ArangoDeployment) error {`
`33`	`34`	`return func(obj *api.ArangoDeployment) error {`
`34`		`- if obj.Status.State == state {`
	`35`	`+ if obj.Status.Phase != api.DeploymentPhaseRunning {`
	`36`	`+ return fmt.Errorf("Expected Running phase, got %s", obj.Status.Phase)`
	`37`	`+ }`
	`38`	`+ if obj.Status.Conditions.IsTrue(api.ConditionTypeReady) {`
`35`	`39`	`return nil`
`36`	`40`	`}`
`37`		`- return fmt.Errorf("Expected state %s, got %s", state, obj.Status.State)`
	`41`	`+ return fmt.Errorf("Expected Ready condition to be set, it is not")`
`38`	`42`	`}`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func TestResiliencePod(t *testing.T) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// Wait for deployment to be ready`
`40`		`- if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`40`	`+ if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`41`	`41`	`t.Fatalf("Deployment not running in time: %v", err)`
`42`	`42`	`}`
`43`	`43`
`@@ -117,7 +117,7 @@ func TestResiliencePVC(t *testing.T) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`// Wait for deployment to be ready`
`120`		`- if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`120`	`+ if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`121`	`121`	`t.Fatalf("Deployment not running in time: %v", err)`
`122`	`122`	`}`
`123`	`123`
`@@ -201,7 +201,7 @@ func TestResilienceService(t *testing.T) {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// Wait for deployment to be ready`
`204`		`- if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`204`	`+ if _, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`205`	`205`	`t.Fatalf("Deployment not running in time: %v", err)`
`206`	`206`	`}`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func TestRocksDBEncryptionSingle(t *testing.T) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// Wait for deployment to be ready`
`47`		`- apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning))`
	`47`	`+ apiObject, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())`
`48`	`48`	`if err != nil {`
`49`	`49`	`t.Errorf("Deployment not running in time: %v", err)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func TestScaleClusterNonTLS(t *testing.T) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// Wait for deployment to be ready`
`37`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`37`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`38`	`38`	`t.Fatalf("Deployment not running in time: %v", err)`
`39`	`39`	`}`
`40`	`40`
`@@ -104,7 +104,7 @@ func TestScaleCluster(t *testing.T) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Wait for deployment to be ready`
`107`		`- if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentHasState(api.DeploymentStateRunning)); err != nil {`
	`107`	`+ if _, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady()); err != nil {`
`108`	`108`	`t.Fatalf("Deployment not running in time: %v", err)`
`109`	`109`	`}`
`110`	`110`