Re-add calls to Sandbox::ok().

2026-02-27 02:00:57 +08:00 · 2012-06-03 13:54:32 -04:00
parent cae983afc2
commit bdbb66d22b
178 changed files with 357 additions and 178 deletions
--- a/t/pt-table-sync/basics.t
+++ b/t/pt-table-sync/basics.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 21;
+   plan tests => 22;
 }

 $sb->wipe_clean($master_dbh);
@@ -239,4 +239,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/bidirectional.t
+++ b/t/pt-table-sync/bidirectional.t
@@ -39,7 +39,7 @@ elsif ( !$r1_dbh ) {

 }
 else {
-   plan tests => 22;
+   plan tests => 23;
 }

 my $output;
@@ -536,4 +536,5 @@ SKIP: {
 # #############################################################################
 diag(`$trunk/sandbox/stop-sandbox 2900 >/dev/null`);
 diag(`$trunk/sandbox/stop-sandbox 2901 >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/binlog_format.t
+++ b/t/pt-table-sync/binlog_format.t
@@ -32,7 +32,7 @@ elsif ( !$vp->version_ge($master_dbh, '5.1.5') ) {
      plan skip_all => 'Sandbox master version not >= 5.1';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }

 $sb->wipe_clean($master_dbh);
@@ -109,4 +109,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/bugs.t
+++ b/t/pt-table-sync/bugs.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 8;
+   plan tests => 9;
 }

 my $sample     = "t/pt-table-sync/samples";
@@ -153,4 +153,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/char_chunking.t
+++ b/t/pt-table-sync/char_chunking.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }

 my $output;
@@ -86,4 +86,5 @@ like(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/check_privs.t
+++ b/t/pt-table-sync/check_privs.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -88,4 +88,5 @@ $master_dbh->do('DROP USER \'test_907\'@\'localhost\'');
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/columns.t
+++ b/t/pt-table-sync/columns.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 5;
+   plan tests => 6;
 }

 $sb->wipe_clean($master_dbh);
@@ -78,4 +78,5 @@ EOF
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/filters.t
+++ b/t/pt-table-sync/filters.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 8;
+   plan tests => 9;
 }

 # Previous tests slave 12347 to 12346 which makes pt-table-checksum
@@ -182,4 +182,5 @@ unlike(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/float_precision.t
+++ b/t/pt-table-sync/float_precision.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -71,4 +71,5 @@ is(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/force_index.t
+++ b/t/pt-table-sync/force_index.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -54,4 +54,5 @@ like($output, qr/FROM `test`\.`issue_37`  WHERE/, 'No USE INDEX hint with --no-i
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/hex_blob.t
+++ b/t/pt-table-sync/hex_blob.t
@@ -23,7 +23,7 @@ if ( !$dbh ) {
   plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 my $output;
@@ -63,4 +63,5 @@ unlike(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/instrumentaiton.t
+++ b/t/pt-table-sync/instrumentaiton.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 my $output = '';
@@ -53,4 +53,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_1052.t
+++ b/t/pt-table-sync/issue_1052.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 my $output;
@@ -66,4 +66,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_1065.t
+++ b/t/pt-table-sync/issue_1065.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 my $output;
@@ -51,4 +51,5 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_218.t
+++ b/t/pt-table-sync/issue_218.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -48,4 +48,5 @@ ok(!$?, 'Issue 218: NULL values compare as equal');
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_22.t
+++ b/t/pt-table-sync/issue_22.t
@@ -24,7 +24,7 @@ if ( !$master_dbh ) {
   plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }

 $sb->wipe_clean($master_dbh);
@@ -55,4 +55,5 @@ is($output, $output2, 'test2.messages matches test.messages (issue 22)');
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_262.t
+++ b/t/pt-table-sync/issue_262.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -54,4 +54,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_408.t
+++ b/t/pt-table-sync/issue_408.t
@@ -30,7 +30,7 @@ elsif ( !$dbh2 ) {
   plan skip_all => 'Cannot connect to second sandbox master';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -57,4 +57,5 @@ like(
 $sb->wipe_clean($master_dbh);
 diag(`/tmp/12348/stop >/dev/null`);
 diag(`rm -rf /tmp/12348 >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_560.t
+++ b/t/pt-table-sync/issue_560.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -72,4 +72,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_616.t
+++ b/t/pt-table-sync/issue_616.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -69,4 +69,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_627.t
+++ b/t/pt-table-sync/issue_627.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -71,4 +71,5 @@ REPLACE INTO `issue_375`.`t`(`id`, `updated_at`, `foo`) VALUES ('100', '2009-09-
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_631.t
+++ b/t/pt-table-sync/issue_631.t
@@ -24,7 +24,7 @@ if ( !$master_dbh ) {
   plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -67,4 +67,5 @@ ok(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_634.t
+++ b/t/pt-table-sync/issue_634.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -57,4 +57,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_644.t
+++ b/t/pt-table-sync/issue_644.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -68,4 +68,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_79.t
+++ b/t/pt-table-sync/issue_79.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }

 $sb->wipe_clean($master_dbh);
@@ -82,4 +82,5 @@ like($output,   qr/test2/,    '--replicate honors --tables (4/4)');
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_804.t
+++ b/t/pt-table-sync/issue_804.t
@@ -28,7 +28,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -55,4 +55,5 @@ is(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_920.t
+++ b/t/pt-table-sync/issue_920.t
@@ -25,7 +25,7 @@ if ( !$dbh ) {
   plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }

 # #############################################################################
@@ -68,4 +68,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_96.t
+++ b/t/pt-table-sync/issue_96.t
@@ -24,7 +24,7 @@ if ( !$master_dbh ) {
   plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -50,4 +50,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_965.t
+++ b/t/pt-table-sync/issue_965.t
@@ -23,7 +23,7 @@ if ( !$dbh ) {
   plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 my $output;
@@ -60,4 +60,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/issue_996.t
+++ b/t/pt-table-sync/issue_996.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 my $output;
@@ -105,4 +105,5 @@ diag(`rm -rf $file >/dev/null`);
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/lock_and_rename.t
+++ b/t/pt-table-sync/lock_and_rename.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -60,4 +60,5 @@ like($output, qr/COMMENT='test1'/, '--lock-and-rename worked');
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/lock_level.t
+++ b/t/pt-table-sync/lock_level.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 $sb->wipe_clean($master_dbh);
@@ -51,4 +51,5 @@ unlike(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/replicate_do_db.t
+++ b/t/pt-table-sync/replicate_do_db.t
@@ -40,7 +40,7 @@ elsif ( !$dbh3 ) {
   plan skip_all => 'Cannot connect to second sandbox slave';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }

 $sb->wipe_clean($master_dbh);
@@ -127,4 +127,5 @@ diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/specify_column_or_index.t
+++ b/t/pt-table-sync/specify_column_or_index.t
@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -59,4 +59,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/sync_to_differnt_db.t
+++ b/t/pt-table-sync/sync_to_differnt_db.t
@@ -31,7 +31,7 @@ elsif ( !$dbh2 ) {
   plan skip_all => 'Cannot connect to second sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 $sb->wipe_clean($master_dbh);
@@ -66,4 +66,5 @@ is(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/traces.t
+++ b/t/pt-table-sync/traces.t
@@ -33,7 +33,7 @@ elsif ( !$mysqlbinlog ) {
   plan skip_all => 'Cannot find mysqlbinlog';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }

 my $output;
@@ -65,4 +65,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/triggers.t
+++ b/t/pt-table-sync/triggers.t
@@ -32,7 +32,7 @@ elsif ( !$vp->version_ge($master_dbh, '5.0.2') ) {
   plan skip_all => 'Sever does not support triggers (< 5.0.2)';
 }
 else {
-   plan tests => 10;
+   plan tests => 11;
 }

 $sb->wipe_clean($master_dbh);
@@ -147,4 +147,5 @@ is(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/wait.t
+++ b/t/pt-table-sync/wait.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }

 my $output;
@@ -129,4 +129,5 @@ cmp_ok(
 kill 15, $pid;
 waitpid ($pid, 0);
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
--- a/t/pt-table-sync/zero_chunk.t
+++ b/t/pt-table-sync/zero_chunk.t
@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
   plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }

 my $output;
@@ -55,4 +55,5 @@ unlike(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;