Skip to content

Commit 5b4b202

Browse files
committed
Fix test failures on js_adminapi_async/scripts/simple_plain_norecord:
- Do not check for the right TLS cipher string when looking at 'replicationSsl' but rather check if it's not null meaning SSL is being used - Wait for replication channels to be ready after switchover to ensure SSL check is done correctly Change-Id: Ib77c5baa68dcdd0b122a7dfd880f6fbf3d8ad73e
1 parent 6ba913d commit 5b4b202

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

unittest/scripts/auto/js_adminapi_async/scripts/simple_plain_norecord.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ check_open_sessions(session1, expected_pids1);
180180
check_open_sessions(session2, expected_pids2);
181181
check_open_sessions(session3, expected_pids3);
182182

183+
testutil.waitReplicationChannelState(__mysql_sandbox_port2, "", "ON");
184+
testutil.waitReplicationChannelState(__mysql_sandbox_port1, "", "ON");
185+
183186
EXPECT_REPLICAS_USE_SSL(session3, 2);
184187

185188
//@ forcePrimaryInstance (prepare)

unittest/scripts/auto/js_adminapi_async/validation/simple_plain_norecord.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ true
389389
"receiverStatus": "ON",
390390
"receiverThreadState": "Waiting for <<<__source_keyword>>> to send event",
391391
"replicationLag": null,
392-
"replicationSsl": "TLS_AES_[[*]]",
392+
"replicationSsl": "[[*]]",
393393
"replicationSslMode": "REQUIRED"
394394
},
395395
"status": "ONLINE"
@@ -404,7 +404,7 @@ true
404404
"receiverStatus": "ON",
405405
"receiverThreadState": "Waiting for <<<__source_keyword>>> to send event",
406406
"replicationLag": null,
407-
"replicationSsl": "TLS_AES_[[*]]",
407+
"replicationSsl": "[[*]]",
408408
"replicationSslMode": "REQUIRED"
409409
},
410410
"status": "ONLINE"

0 commit comments

Comments
 (0)