From 1283ceafdd1cb8fbe5338fcb8832dc54135c26d0 Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Wed, 6 Jun 2012 23:25:51 -0400
Subject: [PATCH] Wait for slaves in pt-upgrade/rewrite_non_select.t to make it
 stable.

---
 t/pt-upgrade/rewrite_non_select.t | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/t/pt-upgrade/rewrite_non_select.t b/t/pt-upgrade/rewrite_non_select.t
index 3a0d4fc8..4113ecfc 100644
--- a/t/pt-upgrade/rewrite_non_select.t
+++ b/t/pt-upgrade/rewrite_non_select.t
@@ -33,8 +33,9 @@ else {
    plan tests => 5;
 }
 
-$sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql');
 $sb->load_file('master1', 't/pt-upgrade/samples/001/tables.sql');
+$sb->load_file('master',  't/pt-upgrade/samples/001/tables.sql');
+$sb->wait_for_slaves();
 
 # Issue 747: Make mk-upgrade rewrite non-SELECT
 
@@ -43,8 +44,9 @@ my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345 P=12348 -u msandbox -p msandbox
 my $c1 = $dbh1->selectrow_arrayref('checksum table test.t')->[1];
 my $c2 = $dbh2->selectrow_arrayref('checksum table test.t')->[1];
 
-ok(
-   $c1 == $c2,
+is(
+   $c1,
+   $c2,
    'Table checksums identical'
 );
 
@@ -59,13 +61,15 @@ ok(
 my $c1_after = $dbh1->selectrow_arrayref('checksum table test.t')->[1];
 my $c2_after = $dbh2->selectrow_arrayref('checksum table test.t')->[1];
 
-ok(
-   $c1_after == $c1,
+is(
+   $c1_after,
+   $c1,
    'Table on host1 not changed'
 );
 
-ok(
-   $c2_after == $c2,
+is(
+   $c2_after,
+   $c2,
    'Table on host2 not changed'
 );