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.
MariaDB · Sep 18, 2020 · 69d536a · 69d536a
1 parent f381e01
commit 69d536a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup.result b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup.result
@@ -19,4 +19,4 @@ connection node_1;
 include/assert_grep.inc [Streaming the backup to joiner at \[::1\]]
 include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:]
 include/assert_grep.inc [IST receiver addr using tcp://\[::1\]]
-include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]]
+include/assert_grep.inc [, listening at: tcp://\[::1\]]
diff --git a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result
@@ -20,4 +20,4 @@ include/assert_grep.inc [Streaming the backup to joiner at \[::1\]]
 include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:]
 connection node_2;
 include/assert_grep.inc [IST receiver addr using tcp://\[::1\]]
-include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]]
+include/assert_grep.inc [, listening at: tcp://\[::1\]]
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test
@@ -56,6 +56,8 @@ DROP TABLE t1;
 --let $assert_select = IST receiver addr using tcp://\[::1\]
 --source include/assert_grep.inc
 
---let $assert_text = Prepared IST receiver, listening at: tcp://\[::1\]
---let $assert_select = Prepared IST receiver, listening at: tcp://\[::1\]
+# The receiver expects IST
+--let $assert_count = 1
+--let $assert_text = , listening at: tcp://\[::1\]
+--let $assert_select = , listening at: tcp://\[::1\]
 --source include/assert_grep.inc
diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test
@@ -64,8 +64,8 @@ DROP TABLE t1;
 --let $assert_select = IST receiver addr using tcp://\[::1\]
 --source include/assert_grep.inc
 
-# There will be only one Prepared IST and in Galera 3 segnos are not printed
---let $assert_count= 1
---let $assert_text = Prepared IST receiver, listening at: tcp://\[::1\]
---let $assert_select = Prepared IST receiver, listening at: tcp://\[::1\]
+# The receiver expects IST
+--let $assert_count = 1
+--let $assert_text = , listening at: tcp://\[::1\]
+--let $assert_select = , listening at: tcp://\[::1\]
 --source include/assert_grep.inc