Skip to content

Commit

Permalink
Improving some comments
Browse files Browse the repository at this point in the history
  • Loading branch information
MerceaOtniel committed Aug 28, 2018
1 parent 6914a62 commit 13dd266
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/e2e/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,18 +262,18 @@ func testClusterReadiness(f *framework.Framework, cluster *api.MysqlCluster) {
// f.ClusterEventuallyCondition(cluster, api.ClusterConditionFailoverAck, core.ConditionFalse, f.Timeout)
}

//test a non-readOnly cluster if it is registered with orchestrator
//test if a non-readOnly cluster is registered with orchestrator
func testClusterIsRegistredWithOrchestrator(f *framework.Framework, cluster *api.MysqlCluster) {
testClusterRegistration(f, cluster, false)
testClusterRegistrationInOrchestrator(f, cluster, false)
}

//test a readOnly cluster if it is registered with orchestrator
//test if a readOnly cluster is registered with orchestrator
func testClusterReadOnlyIsRegistredWithOrchestrator(f *framework.Framework, cluster *api.MysqlCluster) {
testClusterRegistration(f, cluster, true)
testClusterRegistrationInOrchestrator(f, cluster, true)
}

// tests if the cluster is in orchestrator and is properly configured
func testClusterRegistration(f *framework.Framework, cluster *api.MysqlCluster, ReadOnly bool) {
func testClusterRegistrationInOrchestrator(f *framework.Framework, cluster *api.MysqlCluster, ClusterReadOnly bool) {
cluster, err := f.MyClientSet.MysqlV1alpha1().MysqlClusters(f.Namespace.Name).Get(cluster.Name, meta.GetOptions{})
Expect(err).NotTo(HaveOccurred(), "Failed to get cluster '%s'", cluster.Name)

Expand All @@ -287,7 +287,7 @@ func testClusterRegistration(f *framework.Framework, cluster *api.MysqlCluster,
"GTIDMode": Equal("ON"),
"IsUpToDate": Equal(true),
"Binlog_format": Equal("ROW"),
"ReadOnly": Equal(ReadOnly),
"ReadOnly": Equal(ClusterReadOnly),
}), // master node
}
for i := 1; i < int(cluster.Spec.Replicas); i++ {
Expand Down

0 comments on commit 13dd266

Please sign in to comment.