Skip to content

Commit 69d536a

Browse files
committed
MDEV-23751 : galera_3nodes test failures on ipv6 sst tests
Fix assertion text it was too tight for some systems. This is backport from 10.4 and for Galera 3.
1 parent f381e01 commit 69d536a

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ connection node_1;
1919
include/assert_grep.inc [Streaming the backup to joiner at \[::1\]]
2020
include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:]
2121
include/assert_grep.inc [IST receiver addr using tcp://\[::1\]]
22-
include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]]
22+
include/assert_grep.inc [, listening at: tcp://\[::1\]]

mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ include/assert_grep.inc [Streaming the backup to joiner at \[::1\]]
2020
include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:]
2121
connection node_2;
2222
include/assert_grep.inc [IST receiver addr using tcp://\[::1\]]
23-
include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]]
23+
include/assert_grep.inc [, listening at: tcp://\[::1\]]

mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ DROP TABLE t1;
5656
--let $assert_select = IST receiver addr using tcp://\[::1\]
5757
--source include/assert_grep.inc
5858

59-
--let $assert_text = Prepared IST receiver, listening at: tcp://\[::1\]
60-
--let $assert_select = Prepared IST receiver, listening at: tcp://\[::1\]
59+
# The receiver expects IST
60+
--let $assert_count = 1
61+
--let $assert_text = , listening at: tcp://\[::1\]
62+
--let $assert_select = , listening at: tcp://\[::1\]
6163
--source include/assert_grep.inc

mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ DROP TABLE t1;
6464
--let $assert_select = IST receiver addr using tcp://\[::1\]
6565
--source include/assert_grep.inc
6666

67-
# There will be only one Prepared IST and in Galera 3 segnos are not printed
68-
--let $assert_count= 1
69-
--let $assert_text = Prepared IST receiver, listening at: tcp://\[::1\]
70-
--let $assert_select = Prepared IST receiver, listening at: tcp://\[::1\]
67+
# The receiver expects IST
68+
--let $assert_count = 1
69+
--let $assert_text = , listening at: tcp://\[::1\]
70+
--let $assert_select = , listening at: tcp://\[::1\]
7171
--source include/assert_grep.inc

0 commit comments

Comments
 (0)