Galera MTR Tests: Various test stability fixes (take #4)

MariaDB · Sep 10, 2015 · 7d73931 · 7d73931
1 parent ff76214
commit 7d73931
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/mysql-test/suite/galera/r/galera_parallel_simple.result b/mysql-test/suite/galera/r/galera_parallel_simple.result
@@ -19,9 +19,6 @@ COUNT(*) = 10
 SELECT COUNT(*) = 10 FROM t2;
 COUNT(*) = 10
 0
-SELECT COUNT(DISTINCT ID) FROM INFORMATION_SCHEMA.PROCESSLIST;
-COUNT(DISTINCT ID)
-4
 SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'committed%';
 COUNT(*) = 2
 1

diff --git a/mysql-test/suite/galera/r/galera_wan_restart_sst.result b/mysql-test/suite/galera/r/galera_wan_restart_sst.result
@@ -47,6 +47,7 @@ COUNT(*) = 19
 1
 DROP TABLE t1;
 CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
+CALL mtr.add_suppression("WSREP: gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)");
 CALL mtr.add_suppression("Action message in non-primary configuration from member 0");
 CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
 CALL mtr.add_suppression("Action message in non-primary configuration from member 0");

diff --git a/mysql-test/suite/galera/t/galera_wan_restart_sst.test b/mysql-test/suite/galera/t/galera_wan_restart_sst.test
@@ -40,6 +40,7 @@ INSERT INTO t1 VALUES (13);
 --sleep 5
 
 --connection node_1
+--source include/wait_until_connected_again.inc
 INSERT INTO t1 VALUES (11);
 
 --connection node_2
@@ -66,6 +67,7 @@ INSERT INTO t1 VALUES (22);
 --sleep 5
 
 --connection node_1
+--source include/wait_until_connected_again.inc
 INSERT INTO t1 VALUES (21);
 
 --connection node_3
@@ -134,6 +136,7 @@ SELECT COUNT(*) = 19 FROM t1;
 --connection node_1
 DROP TABLE t1;
 CALL mtr.add_suppression("There are no nodes in the same segment that will ever be able to become donors, yet there is a suitable donor outside");
+CALL mtr.add_suppression("WSREP: gcs_caused\\(\\) returned -1 \\(Operation not permitted\\)");
 
 --connection node_2
 CALL mtr.add_suppression("Action message in non-primary configuration from member 0");