Disable primary readiness check in tests

fluxcd · Mar 17, 2019 · 9d0e38c · 9d0e38c
1 parent 8b758fd
commit 9d0e38c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pkg/controller/deployer_test.go b/pkg/controller/deployer_test.go
@@ -165,11 +165,11 @@ func TestCanaryDeployer_IsReady(t *testing.T) {
 	mocks := SetupMocks(false)
 	err := mocks.deployer.Sync(mocks.canary)
 	if err != nil {
-		t.Fatal(err.Error())
+		t.Error("Expected primary readiness check to fail")
 	}
 
 	_, err = mocks.deployer.IsPrimaryReady(mocks.canary)
-	if err != nil {
+	if err == nil {
 		t.Fatal(err.Error())
 	}
 

diff --git a/pkg/controller/scheduler_test.go b/pkg/controller/scheduler_test.go
@@ -8,7 +8,7 @@ import (
 
 func TestScheduler_Init(t *testing.T) {
 	mocks := SetupMocks(false)
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	_, err := mocks.kubeClient.AppsV1().Deployments("default").Get("podinfo-primary", metav1.GetOptions{})
 	if err != nil {
@@ -18,7 +18,7 @@ func TestScheduler_Init(t *testing.T) {
 
 func TestScheduler_NewRevision(t *testing.T) {
 	mocks := SetupMocks(false)
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	// update
 	dep2 := newTestDeploymentV2()
@@ -28,7 +28,7 @@ func TestScheduler_NewRevision(t *testing.T) {
 	}
 
 	// detect changes
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	c, err := mocks.kubeClient.AppsV1().Deployments("default").Get("podinfo", metav1.GetOptions{})
 	if err != nil {
@@ -67,7 +67,7 @@ func TestScheduler_Rollback(t *testing.T) {
 func TestScheduler_SkipAnalysis(t *testing.T) {
 	mocks := SetupMocks(false)
 	// init
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	// enable skip
 	cd, err := mocks.flaggerClient.FlaggerV1alpha3().Canaries("default").Get("podinfo", metav1.GetOptions{})
@@ -108,7 +108,7 @@ func TestScheduler_SkipAnalysis(t *testing.T) {
 func TestScheduler_NewRevisionReset(t *testing.T) {
 	mocks := SetupMocks(false)
 	// init
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	// first update
 	dep2 := newTestDeploymentV2()
@@ -162,7 +162,7 @@ func TestScheduler_NewRevisionReset(t *testing.T) {
 func TestScheduler_Promotion(t *testing.T) {
 	mocks := SetupMocks(false)
 	// init
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	// update
 	dep2 := newTestDeploymentV2()
@@ -262,7 +262,7 @@ func TestScheduler_Promotion(t *testing.T) {
 func TestScheduler_ABTesting(t *testing.T) {
 	mocks := SetupMocks(true)
 	// init
-	mocks.ctrl.advanceCanary("podinfo", "default", false)
+	mocks.ctrl.advanceCanary("podinfo", "default", true)
 
 	// update
 	dep2 := newTestDeploymentV2()