From 7d73931cbcc03e4b6f0939f29be7e998585b555e Mon Sep 17 00:00:00 2001 From: Philip Stoev Date: Wed, 12 Aug 2015 06:40:59 -0700 Subject: Galera MTR Tests: Various test stability fixes (take #4) --- mysql-test/suite/galera/r/galera_parallel_simple.result | 3 --- mysql-test/suite/galera/r/galera_wan_restart_sst.result | 1 + mysql-test/suite/galera/t/galera_wan_restart_sst.test | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/suite/galera/r/galera_parallel_simple.result b/mysql-test/suite/galera/r/galera_parallel_simple.result index d6743780b2d..294a94baed3 100644 --- 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 index ead4f115b91..15de0fab342 100644 --- 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 index 1406ba67386..9b12eeed1ac 100644 --- 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"); -- cgit v1.2.1