From 12eb1bfb21f77ece18466e702e88bc2fd83ca251 Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Mon, 4 Jun 2012 14:06:06 -0700
Subject: [PATCH] Stop 12348 in pt-upgrade tests.

---
 t/pt-upgrade/basics.t             | 2 +-
 t/pt-upgrade/daemon.t             | 1 +
 t/pt-upgrade/rewrite_non_select.t | 5 ++++-
 t/pt-upgrade/skip_non_select.t    | 1 -
 t/pt-upgrade/warnings.t           | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/t/pt-upgrade/basics.t b/t/pt-upgrade/basics.t
index 2afc0cb7..38d4a7dc 100644
--- a/t/pt-upgrade/basics.t
+++ b/t/pt-upgrade/basics.t
@@ -182,7 +182,7 @@ like(
 # Done.
 # #############################################################################
 diag(`rm /tmp/left-outfile.txt /tmp/right-outfile.txt 2>/dev/null`);
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
 $sb->wipe_clean($dbh1);
-$sb->wipe_clean($dbh2);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/daemon.t b/t/pt-upgrade/daemon.t
index 9b806f32..f0ab38a2 100644
--- a/t/pt-upgrade/daemon.t
+++ b/t/pt-upgrade/daemon.t
@@ -48,5 +48,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/rewrite_non_select.t b/t/pt-upgrade/rewrite_non_select.t
index 608c4f44..3a0d4fc8 100644
--- a/t/pt-upgrade/rewrite_non_select.t
+++ b/t/pt-upgrade/rewrite_non_select.t
@@ -69,7 +69,10 @@ ok(
    'Table on host2 not changed'
 );
 
+# #############################################################################
+# Done.
+# #############################################################################
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
 $sb->wipe_clean($dbh1);
-$sb->wipe_clean($dbh2);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/skip_non_select.t b/t/pt-upgrade/skip_non_select.t
index 42dcfbfb..105a70e2 100644
--- a/t/pt-upgrade/skip_non_select.t
+++ b/t/pt-upgrade/skip_non_select.t
@@ -51,7 +51,6 @@ ok(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh1);
-$sb->wipe_clean($dbh2);
 diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-upgrade/warnings.t b/t/pt-upgrade/warnings.t
index b44c3eb4..d4dcc01f 100644
--- a/t/pt-upgrade/warnings.t
+++ b/t/pt-upgrade/warnings.t
@@ -94,6 +94,6 @@ ok(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh1);
-$sb->wipe_clean($dbh2);
+diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;