Skip to content

Commit f84b48d

Browse files
committed
Fixed dba_cluster_dissolve and dba_cluster_add_instance tests:
Added missing memberSslMode set to 'DISABLED' if SSL is not available in createCluster() calls.
1 parent e6c2e77 commit f84b48d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

unittest/scripts/js_devapi/scripts/dba_cluster_add_instance.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ shell.connect({scheme: 'mysql', host: localhost, port: __mysql_sandbox_port1, us
77
var singleSession = session;
88

99
if (__have_ssl)
10-
var single = dba.createCluster('single', {memberSslMode:'REQUIRED'});
10+
var single = dba.createCluster('single', {memberSslMode: 'REQUIRED'});
1111
else
12-
var single = dba.createCluster('single');
12+
var single = dba.createCluster('single', {memberSslMode: 'DISABLED'});
1313

1414
//@ Success adding instance
1515
add_instance_to_cluster(single, __mysql_sandbox_port2);

unittest/scripts/js_devapi/scripts/dba_cluster_dissolve.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ shell.connect({scheme: 'mysql', host: localhost, port: __mysql_sandbox_port1, us
77
var singleSession = session;
88

99
if (__have_ssl)
10-
var single = dba.createCluster('single', {memberSslMode:'REQUIRED'});
10+
var single = dba.createCluster('single', {memberSslMode: 'REQUIRED'});
1111
else
12-
var single = dba.createCluster('single');
12+
var single = dba.createCluster('single', {memberSslMode: 'DISABLED'});
1313

1414
//@ Success adding instance 2
1515
add_instance_to_cluster(single, __mysql_sandbox_port2);
@@ -43,9 +43,9 @@ var multiSession = session;
4343

4444
//@ Create multi-primary cluster
4545
if (__have_ssl)
46-
var multi = dba.createCluster('multi', {multiMaster: true, memberSslMode:'REQUIRED', clearReadOnly: true, force: true});
46+
var multi = dba.createCluster('multi', {multiMaster: true, memberSslMode: 'REQUIRED', clearReadOnly: true, force: true});
4747
else
48-
var multi = dba.createCluster('multi', {multiMaster: true, clearReadOnly: true, force: true});
48+
var multi = dba.createCluster('multi', {multiMaster: true, memberSslMode: 'DISABLED', clearReadOnly: true, force: true});
4949

5050
//@ Success adding instance 2 mp
5151
add_instance_to_cluster(multi, __mysql_sandbox_port2);
@@ -73,9 +73,9 @@ shell.connect({scheme: 'mysql', host: localhost, port: __mysql_sandbox_port1, us
7373
var singleSession2 = session;
7474

7575
if (__have_ssl)
76-
var single2 = dba.createCluster('single2', {memberSslMode:'REQUIRED', clearReadOnly: true});
76+
var single2 = dba.createCluster('single2', {memberSslMode: 'REQUIRED', clearReadOnly: true});
7777
else
78-
var single2 = dba.createCluster('single2', {clearReadOnly: true});
78+
var single2 = dba.createCluster('single2', {memberSslMode: 'DISABLED', clearReadOnly: true});
7979

8080
//@ Success adding instance 2 2
8181
add_instance_to_cluster(single2, __mysql_sandbox_port2);
@@ -116,9 +116,9 @@ shell.connect({scheme: 'mysql', host: localhost, port: __mysql_sandbox_port1, us
116116
var multiSession2 = session;
117117

118118
if (__have_ssl)
119-
var multi2 = dba.createCluster('multi2', {memberSslMode:'REQUIRED', clearReadOnly: true, multiMaster: true, force: true});
119+
var multi2 = dba.createCluster('multi2', {memberSslMode: 'REQUIRED', clearReadOnly: true, multiMaster: true, force: true});
120120
else
121-
var multi2 = dba.createCluster('multi2', {clearReadOnly: true, multiMaster: true, force: true});
121+
var multi2 = dba.createCluster('multi2', {memberSslMode: 'DISABLED', clearReadOnly: true, multiMaster: true, force: true});
122122

123123
//@ Success adding instance 2 mp 2
124124
add_instance_to_cluster(multi2, __mysql_sandbox_port2);

0 commit comments

Comments
 (0)