test(perf): unit tests speed-up

Author: pchmieli

controllers/cassandracluster/cassandra_status_test.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/cscetbon/casskop/controllers/common"
 	"github.com/cscetbon/casskop/pkg/k8s"
+	"github.com/jarcoal/httpmock"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -375,6 +376,10 @@ func assertRackStatus(assert *assert.Assertions, cc *api.CassandraCluster, dcRac
 
 func TestCassandraClusterReconciler(t *testing.T) {
 
+	// tests speed-up
+	httpmock.Activate()
+	defer httpmock.DeactivateAndReset()
+
 	// Mock request to simulate Reconcile() being called on an event for a
 	// watched resource .
 	rcc, req := helperCreateCassandraCluster(context.TODO(), t, "cassandracluster-2DC.yaml")
@@ -393,6 +398,14 @@ func TestCassandraClusterReconciler(t *testing.T) {
 
 func TestCassandraClusterReconcilerMultiNodePerRack(t *testing.T) {
 
+	// override delay wait to speed up tests
+	overrideDelayWaitWithNoDelay()
+	defer restoreDefaultDelayWait()
+
+	// tests speed-up
+	httpmock.Activate()
+	defer httpmock.DeactivateAndReset()
+
 	// Mock request to simulate Reconcile() being called on an event for a
 	// watched resource .
 	rcc, req := helperCreateCassandraCluster(context.TODO(), t, "cassandracluster-2DC-2racksEach-2nodesPerRack.yaml")
@@ -411,6 +424,11 @@ func TestCassandraClusterReconcilerMultiNodePerRack(t *testing.T) {
 
 // test that we detect an addition of a configmap
 func TestUpdateStatusIfconfigMapHasChangedWithNoConfigMap(t *testing.T) {
+
+	// tests speed-up
+	httpmock.Activate()
+	defer httpmock.DeactivateAndReset()
+
 	// Mock request to simulate Reconcile() being called on an event for a
 	// watched resource .
 	rcc, req := helperCreateCassandraCluster(context.TODO(), t, "cassandracluster-2DC.yaml")
@@ -464,6 +482,11 @@ func TestUpdateStatusIfconfigMapHasChangedWithNoConfigMap(t *testing.T) {
 
 // test that we detect a change in a configmap
 func TestUpdateStatusIfconfigMapHasChangedWithConfigMap(t *testing.T) {
+
+	// tests speed-up
+	httpmock.Activate()
+	defer httpmock.DeactivateAndReset()
+
 	// Mock request to simulate Reconcile() being called on an event for a
 	// watched resource .
 	rcc, req := helperCreateCassandraCluster(context.TODO(), t, "cassandracluster-2DC-configmap.yaml")
@@ -535,6 +558,11 @@ func TestUpdateStatusIfconfigMapHasChangedWithConfigMap(t *testing.T) {
 
 // test that we detect a change in a the docker image
 func TestUpdateStatusIfDockerImageHasChanged(t *testing.T) {
+
+	// tests speed-up
+	httpmock.Activate()
+	defer httpmock.DeactivateAndReset()
+
 	// Mock request to simulate Reconcile() being called on an event for a
 	// watched resource .
 	rcc, req := helperCreateCassandraCluster(context.TODO(), t, "cassandracluster-2DC-configmap.yaml")
@@ -611,8 +639,12 @@ func overrideDelayWaitWithNoDelay() {
 	delayWait = func() time.Duration {
 		return 0
 	}
+	retryInterval = func() time.Duration {
+		return time.Millisecond
+	}
 }
 
 func restoreDefaultDelayWait() {
 	delayWait = defaultDelayWait
+	retryInterval = defaultRetryInterval
 }

controllers/cassandracluster/decommission_test.go

@@ -98,13 +98,13 @@ func TestOneDecommission(t *testing.T) {
 	overrideDelayWaitWithNoDelay()
 	defer restoreDefaultDelayWait()
 
-	ctx := context.TODO()
-	rcc, req := createCassandraClusterWithNoDisruption(t, "cassandracluster-1DC.yaml")
-
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
 	assert := assert.New(t)
 
+	ctx := context.TODO()
+	rcc, req := createCassandraClusterWithNoDisruption(t, "cassandracluster-1DC.yaml")
+
 	assertCCStatusLastAction(assert, rcc, api.ClusterPhaseInitial, api.StatusDone)
 	assertClusterStatusPhaseV2(assert, rcc, api.ClusterPhaseV2Running)
 

controllers/cassandracluster/pod_operation.go

@@ -675,7 +675,7 @@ func (rcc *CassandraClusterReconciler) finalizeOperation(ctx context.Context, er
 		}
 		logrus.WithFields(logrus.Fields{"cluster": cc.Name, "rack": dcRackName, "pod": pod.Name,
 			"status": status}).Debug("Can't get new version of Cassandra Cluster. Will try again")
-		time.Sleep(retryInterval)
+		time.Sleep(retryInterval())
 	}
 }
 
@@ -830,7 +830,7 @@ func (rcc *CassandraClusterReconciler) runRemove(ctx context.Context, hostName s
 }
 
 func (rcc *CassandraClusterReconciler) waitUntilPvcIsDeleted(ctx context.Context, namespace, pvcName string) error {
-	err := wait.Poll(retryInterval, deletedPvcTimeout, func() (done bool, err error) {
+	err := wait.Poll(retryInterval(), deletedPvcTimeout, func() (done bool, err error) {
 		_, err = rcc.GetPVC(ctx, namespace, pvcName)
 		if err != nil && apierrors.IsNotFound(err) {
 			logrus.WithFields(logrus.Fields{"namespace": namespace,

controllers/cassandracluster/scaleup_test.go

@@ -65,12 +65,12 @@ func TestAddTwoNodes(t *testing.T) {
 	overrideDelayWaitWithNoDelay()
 	defer restoreDefaultDelayWait()
 
-	rcc, req := createCassandraClusterWithNoDisruption(t, "cassandracluster-1DC.yaml")
-
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
 	assert := assert.New(t)
 
+	rcc, req := createCassandraClusterWithNoDisruption(t, "cassandracluster-1DC.yaml")
+
 	assert.Equal(int32(3), rcc.cc.Spec.NodesPerRacks)
 
 	cassandraCluster := rcc.cc.DeepCopy()

controllers/cassandracluster/statefulset.go

@@ -39,10 +39,16 @@ import (
 )
 
 var (
-	retryInterval = time.Second
-	timeout       = time.Second * 5
+	// visible for tests
+	retryInterval = defaultRetryInterval
+
+	timeout = time.Second * 5
 )
 
+func defaultRetryInterval() time.Duration {
+	return time.Second
+}
+
 // GetStatefulSet return the Statefulset name from the cluster in the namespace
 func (rcc *CassandraClusterReconciler) GetStatefulSet(ctx context.Context, namespace, name string) (*appsv1.StatefulSet, error) {
 
@@ -89,7 +95,7 @@ func (rcc *CassandraClusterReconciler) UpdateStatefulSet(ctx context.Context, st
 		return fmt.Errorf("failed to update cassandra statefulset: %cc", err)
 	}
 	//Check that the new revision of statefulset has been taken into account
-	err := wait.Poll(retryInterval, timeout, func() (done bool, err error) {
+	err := wait.Poll(retryInterval(), timeout, func() (done bool, err error) {
 		newSts, err := rcc.GetStatefulSet(ctx, statefulSet.Namespace, statefulSet.Name)
 		if err != nil && !apierrors.IsNotFound(err) {
 			return false, fmt.Errorf("failed to get cassandra statefulset: %cc", err)