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

t/lib/ChangeHandler.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 32;
+use Test::More tests => 33;
 
 use ChangeHandler;
 use Quoter;
@@ -471,4 +471,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh) if $dbh;
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/CompareQueryTimes.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 24;
+   plan tests => 25;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -192,4 +192,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/CompareResults.t

@@ -43,7 +43,7 @@ elsif ( !$dbh2 ) {
    plan skip_all => "Cannot connect to sandbox slave";
 }
 else {
-   plan tests => 56;
+   plan tests => 57;
 }
 
 Transformers->import(qw(make_checksum));
@@ -777,4 +777,5 @@ like(
 diag(`rm -rf $tmpdir`);
 diag(`rm -rf /tmp/*outfile.txt`);
 $sb->wipe_clean($dbh1);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/CompareWarnings.t

@@ -28,7 +28,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 20;
+   plan tests => 21;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -360,4 +360,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/CopyRowsInsertSelect.t

@@ -39,7 +39,7 @@ elsif ( !@{$dbh->selectcol_arrayref('SHOW DATABASES LIKE "sakila"')} ) {
    plan skip_all => "Sandbox master does not have the sakila database";
 }
 else {
-   plan tests => 14;
+   plan tests => 15;
 }
 
 my $q      = new Quoter();
@@ -216,4 +216,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/Cxn.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 16;
+use Test::More tests => 17;
 
 use Sandbox;
 use OptionParser;
@@ -208,6 +208,7 @@ is(
    $hostname,
    'name() uses @@hostname'
 );
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
 # ############################################################################
 # Default cxn, should be equivalent to 'h=localhost'.
@@ -255,4 +256,5 @@ $o->get_opts();
 # Done.
 # #############################################################################
 $master_dbh->disconnect() if $master_dbh;
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/ExplainAnalyzer.t

@@ -32,7 +32,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 16;
+   plan tests => 17;
 }
 
 $dbh->do('use sakila');
@@ -574,4 +574,5 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/IndexUsage.t

@@ -10,7 +10,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 6;
+use Test::More tests => 7;
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use IndexUsage;
@@ -250,4 +250,5 @@ SKIP: {
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/KeySize.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 18;
+   plan tests => 19;
 }
 
 my $q  = new Quoter();
@@ -205,4 +205,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/MasterSlave.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 50;
+use Test::More tests => 51;
 
 use MasterSlave;
 use DSNParser;
@@ -702,4 +702,5 @@ diag(`$trunk/sandbox/stop-sandbox 2903 2902 2901 2900 >/dev/null`);
 diag(`/tmp/12346/use -e "set global read_only=1"`);
 diag(`/tmp/12347/use -e "set global read_only=1"`);
 diag(`$trunk/sandbox/test-env reset`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/MockSyncStream.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 5;
+use Test::More tests => 6;
 
 use MockSyncStream;
 use Quoter;
@@ -199,4 +199,5 @@ SKIP: {
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/MySQLConfig.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 29;
+use Test::More tests => 30;
 
 use MySQLConfig;
 use DSNParser;
@@ -840,4 +840,5 @@ like(
    qr/Complete test coverage/,
    '_d() works'
 );
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/NibbleIterator.t

@@ -39,7 +39,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 50;
+   plan tests => 51;
 }
 
 my $q   = new Quoter();
@@ -873,4 +873,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/OobNibbleIterator.t

@@ -41,7 +41,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 16;
+   plan tests => 17;
 }
 
 my $q   = new Quoter();
@@ -289,4 +289,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/Outfile.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 1;
+use Test::More tests => 2;
 
 use Outfile;
 use DSNParser;
@@ -69,4 +69,5 @@ ok(
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/QueryReportFormatter.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 44;
+use Test::More tests => 45;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -1570,4 +1570,5 @@ like(
    qr/Complete test coverage/,
    '_d() works'
 );
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/QueryReview.t

@@ -30,7 +30,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 8;
+   plan tests => 9;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -304,4 +304,5 @@ like(
    '_d() works'
 );
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/Quoter.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 54;
+use Test::More tests => 55;
 
 use Quoter;
 use PerconaTest;
@@ -212,4 +212,5 @@ SKIP: {
 # ###########################################################################
 # Done.
 # ###########################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/RowChecksum.t

@@ -27,7 +27,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 28;
+   plan tests => 29;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -425,4 +425,5 @@ is(
 # Done.
 # ############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/RowDiff-custom.t

@@ -92,7 +92,7 @@ elsif ( !$slave_dbh ) {
    plan skip_all => "Cannot connect to sandbox slave";
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 
@@ -187,4 +187,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;

t/lib/RowDiff.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 26;
+use Test::More tests => 27;
 
 use MockSync;
 use RowDiff;
@@ -549,4 +549,5 @@ SKIP: {
    $sb->wipe_clean($slave_dbh);
 }
 
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/SchemaIterator.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 29;
+use Test::More tests => 30;
 
 use SchemaIterator;
 use FileIterator;
@@ -393,4 +393,5 @@ test_so(
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableChecksum.t

@@ -27,7 +27,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 else {
-   plan tests => 51;
+   plan tests => 52;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -665,4 +665,5 @@ is($query,
    'Ignores specified columns');
 
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableChunker.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 93;
+   plan tests => 94;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -1357,4 +1357,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableParser.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 39;
+use Test::More tests => 40;
 
 use TableParser;
 use Quoter;
@@ -899,4 +899,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh) if $dbh;
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableSyncChunk.t

@@ -21,7 +21,7 @@ my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $dbh = $sb->get_dbh_for('master');
 
 if ( $dbh ) {
-   plan tests => 34;
+   plan tests => 35;
 }
 else {
    plan skip_all => 'Cannot connect to MySQL';
@@ -403,4 +403,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableSyncNibble.t

@@ -34,7 +34,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 36;
+   plan tests => 37;
 }
 
 my $mysql = $sb->_use_for('master');
@@ -629,4 +629,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableSyncer.t

@@ -50,7 +50,7 @@ elsif ( !$dst_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 61;
+   plan tests => 62;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -1076,4 +1076,5 @@ like(
 );
 $sb->wipe_clean($src_dbh);
 $sb->wipe_clean($dst_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/TableUsage.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 34;
+use Test::More tests => 35;
 
 use PerconaTest;
 use QueryParser;
@@ -813,4 +813,5 @@ like(
    qr/Complete test coverage/,
    '_d() works'
 );
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/Transformers.t

@@ -14,7 +14,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 73;
+use Test::More tests => 74;
 
 use Transformers;
 use PerconaTest;
@@ -296,4 +296,5 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/lib/VersionParser.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 3;
+use Test::More tests => 4;
 
 use VersionParser;
 use PerconaTest;
@@ -42,4 +42,5 @@ SKIP: {
 # #############################################################################
 # Done.
 # #############################################################################
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/basics.t

@@ -37,7 +37,7 @@ if ( ($rows || 0) != 4 ) {
    plan skip_all => 'Failed to load tables1-4.sql';
 }
 else {
-   plan tests => 25;
+   plan tests => 26;
 }
 
 my @args = qw(--dry-run --where 1=1);
@@ -189,4 +189,5 @@ cmp_ok(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/bulk_delete.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 13;
+   plan tests => 14;
 }
 
 my $output;
@@ -71,4 +71,5 @@ is($output + 0, 105, 'Bulk delete works OK with normal insert');
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/bulk_insert.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 9;
+   plan tests => 10;
 }
 
 my $output;
@@ -88,4 +88,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/bulk_regular_insert.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output;
@@ -94,4 +94,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/check_slave_lag.t

@@ -27,7 +27,7 @@ elsif ( !$dbh2 ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 $sb->wipe_clean($dbh);
@@ -100,4 +100,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($dbh);
 $sb->wipe_clean($dbh2);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/compact_col_vals.t

@@ -24,7 +24,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 my $output;
@@ -81,4 +81,5 @@ is(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/delete_more.t

@@ -24,7 +24,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 18;
+   plan tests => 19;
 }
 
 my $output;
@@ -297,4 +297,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/dest.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 13;
+   plan tests => 14;
 }
 
 my $output;
@@ -101,4 +101,5 @@ is($output + 0, 10, 'Rows got archived');
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/file.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 11;
+   plan tests => 12;
 }
 
 my $output;
@@ -116,4 +116,5 @@ like($warning, qr/Cannot find encoding/, "..and throws a useful warning");
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/gt_n.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $output;
@@ -62,4 +62,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/indexes.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 17;
+   plan tests => 18;
 }
 
 my $output;
@@ -103,4 +103,5 @@ like ( $output, qr/WHERE \(1=1\) AND \(\(`a` >= \?\)\) LIMIT/, 'Can ascend just
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_1152.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }
 
 my $output;
@@ -54,4 +54,5 @@ ok(1, "Issue 1152 test stub");
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_1166.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 my $output;
@@ -82,4 +82,5 @@ like(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_1225.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output;
@@ -93,4 +93,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_1229.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $output;
@@ -75,4 +75,5 @@ diag(`rm -rf $file >/dev/null`);
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_131.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }
 
 my $output;
@@ -54,4 +54,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_524.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 1;
+   plan tests => 2;
 }
 
 my $output;
@@ -49,4 +49,5 @@ unlike(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/issue_655.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $output;
@@ -56,4 +56,5 @@ like(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/plugin.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 17;
+   plan tests => 18;
 }
 
 my $output;
@@ -94,4 +94,5 @@ is($output + 0, 2, 'Plugin archived all rows to table_odd OK');
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/purge.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 my $output;
@@ -64,4 +64,5 @@ is($output + 0, 1, 'Purged some rows ok');
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/res_fk.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 7;
+   plan tests => 8;
 }
 
 my $output;
@@ -101,4 +101,5 @@ is_deeply(
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/safe_auto_increment.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output;
@@ -55,4 +55,5 @@ is($output + 0, 0, "Disabled safeautoinc purged whole table");
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-archiver/standard_options.t

@@ -24,7 +24,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 my $output;
@@ -120,4 +120,5 @@ SKIP: {
 # #############################################################################
 $sb->wipe_clean($dbh);
 $sb->wipe_clean($dbh2) if $dbh2;
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-config-diff/basics.t

@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 13;
+   plan tests => 14;
 }
 
 my $cnf = '/tmp/12345/my.sandbox.cnf';
@@ -166,4 +166,5 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-config-diff/reports.t

@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 my $cnf = '/tmp/12345/my.sandbox.cnf';
@@ -62,4 +62,5 @@ is(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-deadlock-logger/basics.t

@@ -24,7 +24,7 @@ if ( !$dbh1 || !$dbh2 ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 10;
+   plan tests => 11;
 }
 
 my $output;
@@ -169,4 +169,5 @@ $dbh1->commit;
 $dbh2->commit;
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-deadlock-logger/clear_deadlocks.t

@@ -23,7 +23,7 @@ if ( !$dbh1 ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output;
@@ -67,4 +67,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-deadlock-logger/create_dest_table.t

@@ -23,7 +23,7 @@ if ( !$dbh1 ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 my $output;
@@ -55,4 +55,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-deadlock-logger/standard_options.t

@@ -23,7 +23,7 @@ if ( !$dbh1 ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 10;
+   plan tests => 11;
 }
 
 my $output;
@@ -106,4 +106,5 @@ diag(`rm -rf /tmp/mk-deadlock-logger.pid`);
 # #############################################################################
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-duplicate-key-checker/basics.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 9;
+   plan tests => 10;
 }
 
 my $output;
@@ -111,4 +111,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-duplicate-key-checker/clustered_keys.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $cnf    = "/tmp/12345/my.sandbox.cnf";
@@ -51,4 +51,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-duplicate-key-checker/issue_1192.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $output;
@@ -52,4 +52,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-duplicate-key-checker/issue_298.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $output;
@@ -43,4 +43,5 @@ unlike($output, qr/Use of uninitialized var/, 'Does not crash on undef var');
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-duplicate-key-checker/issue_331.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $cnf    = "/tmp/12345/my.sandbox.cnf";
@@ -51,4 +51,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-duplicate-key-checker/issue_663.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $output;
@@ -49,4 +49,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-find/pt-find.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 21;
+   plan tests => 22;
 }
 
 my $output;
@@ -211,4 +211,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-fk-error-logger/basics.t

@@ -24,7 +24,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 8;
+   plan tests => 9;
 }
 
 $sb->wipe_clean($dbh);
@@ -125,4 +125,5 @@ $dbh->do('DROP TABLE test.parent');
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-heartbeat/basics.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 18;
+   plan tests => 19;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -141,4 +141,5 @@ like(
 `rm $pid_file $sent_file 2>/dev/null`;
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-heartbeat/multi_update_mode.t

@@ -34,7 +34,7 @@ elsif ( !$slave2_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave2';
 }
 else {
-   plan tests => 29;
+   plan tests => 30;
 }
 
 $sb->create_dbs($master_dbh, ['test']);
@@ -251,4 +251,5 @@ foreach my $port (@ports) {
 diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null`);
 $sb->wipe_clean($master_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-heartbeat/standard_options.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 $sb->create_dbs($dbh, [qw(test)]);
@@ -52,4 +52,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-index-usage/basics.t

@@ -28,7 +28,7 @@ if ( !@{ $dbh->selectall_arrayref('show databases like "sakila"') } ) {
    plan skip_all => "Sakila database is not loaded";
 }
 else {
-   plan tests => 9;
+   plan tests => 10;
 }
 
 my $cnf     = '/tmp/12345/my.sandbox.cnf';
@@ -140,4 +140,5 @@ is(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-index-usage/save_results.t

@@ -28,7 +28,7 @@ if ( !@{ $dbh->selectall_arrayref('show databases like "sakila"') } ) {
    plan skip_all => "Sakila database is not loaded";
 }
 else {
-   plan tests => 18;
+   plan tests => 19;
 }
 
 my $cnf     = '/tmp/12345/my.sandbox.cnf';
@@ -366,4 +366,5 @@ SKIP: {
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-ioprofile/pt-ioprofile.t

@@ -24,7 +24,7 @@ if ( !$dbh ) {
    plan skip_all => "Cannot connect to master sandbox";
 }
 else {
-   plan tests => 5;
+   plan tests => 6;
 }
 
 my $output = "";
@@ -71,4 +71,5 @@ like(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-kill/basics.t

@@ -25,7 +25,7 @@ if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output;
@@ -85,4 +85,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-kill/execute_command.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 9;
+use Test::More tests => 10;
 
 use PerconaTest;
 use Sandbox;
@@ -119,4 +119,5 @@ SKIP: {
 diag(`rm $out 2>/dev/null`);
 $sb->wipe_clean($master_dbh) if $master_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-kill/kill.t

@@ -29,7 +29,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 8;
+   plan tests => 9;
 }
 
 my $output;
@@ -121,4 +121,5 @@ is(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-kill/match.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 15;
+use Test::More tests => 16;
 
 use PerconaTest;
 use Sandbox;
@@ -174,4 +174,5 @@ SKIP: {
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-kill/standard_options.t

@@ -9,7 +9,7 @@ BEGIN {
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 6;
+use Test::More tests => 7;
 
 use PerconaTest;
 use Sandbox;
@@ -74,4 +74,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($master_dbh) if $master_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-log-player/issue_799.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 # #############################################################################
@@ -57,4 +57,5 @@ is_deeply(
 $sb->wipe_clean($dbh);
 diag(`rm -rf ./session-results-*`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-log-player/issue_903.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 # #############################################################################
@@ -54,4 +54,5 @@ like(
 # #############################################################################
 diag(`rm -rf ./session-results-*`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-log-player/play.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 20;
+   plan tests => 21;
 }
 
 my $output;
@@ -95,4 +95,5 @@ diag(`rm session-results-*.txt 2>/dev/null`);
 diag(`rm -rf $tmpdir 2>/dev/null`);
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-online-schema-change/alter_active_table.t

@@ -33,7 +33,7 @@ elsif ( !$slave_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 7;
+   plan tests => 8;
 }
 
 my $output;
@@ -201,4 +201,5 @@ check_ids(qw(pt_osc t id), get_ids());
 diag(`rm -rf $query_table_stop >/dev/null 2>&1`);
 diag(`rm -rf $query_table_output >/dev/null 2>&1`);
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-online-schema-change/basics.t

@@ -33,7 +33,7 @@ elsif ( !$slave_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 118;
+   plan tests => 119;
 }
 
 my $q      = new Quoter();
@@ -663,4 +663,5 @@ test_alter_table(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-online-schema-change/bugs.t

@@ -29,7 +29,7 @@ elsif ( !$slave_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave1';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -115,4 +115,5 @@ like $output,
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-online-schema-change/privs.t

@@ -31,7 +31,7 @@ elsif ( !@{$master_dbh->selectall_arrayref('show databases like "sakila"')} ) {
    plan skip_all => 'sakila database is not loaded';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -83,4 +83,5 @@ diag(`/tmp/12345/use -u root -e "drop user 'osc_user'\@'%'"`);
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-online-schema-change/sanity_checks.t

@@ -29,7 +29,7 @@ if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 5;
+   plan tests => 6;
 }
 
 my $q      = new Quoter();
@@ -110,4 +110,5 @@ throws_ok(
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-online-schema-change/skip_innodb.t

@@ -26,7 +26,7 @@ if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master 12348';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
@@ -57,4 +57,5 @@ is(
 # Done.
 # #############################################################################
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-advisor/get_create_table.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output = "";
@@ -76,4 +76,5 @@ is(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-advisor/review.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 5;
+   plan tests => 6;
 }
 
 my $output = "";
@@ -99,4 +99,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/collect_and_report_cycles.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $run_with = "$trunk/bin/pt-query-digest --report-format=query_report --limit 10 $trunk/t/lib/samples/slowlogs/";
@@ -68,4 +68,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/daemon.t

@@ -10,7 +10,7 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Time::HiRes qw(sleep);
-use Test::More tests => 7;
+use Test::More tests => 8;
 
 use PerconaTest;
 use Sandbox;
@@ -68,4 +68,5 @@ SKIP: {
 # #############################################################################
 `rm $pid_file >/dev/null 2>&1`;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/execute.t

@@ -30,7 +30,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 my $output = '';
@@ -95,4 +95,5 @@ is_deeply(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/explain.t

@@ -30,7 +30,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 my $sample = "t/pt-query-digest/samples/";
@@ -119,4 +119,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/explain_partitions.t

@@ -28,7 +28,7 @@ elsif ( !$vp->version_ge($dbh, '5.1.0') ) {
    plan skip_all => 'Sandbox master version not >= 5.1';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 # #############################################################################
@@ -48,4 +48,5 @@ like(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/issue_1186.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 # #############################################################################
@@ -50,4 +50,5 @@ ok(
 # Done.
 # #############################################################################
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/issue_360.t

@@ -23,7 +23,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 $sb->create_dbs($dbh, ['test']);
@@ -55,4 +55,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/mirror.t

@@ -28,7 +28,7 @@ elsif ( !$dbh2 ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 else {
-   plan tests => 4;
+   plan tests => 5;
 }
 
 my $output;
@@ -104,4 +104,5 @@ $dbh1->do('set global read_only=0');
 $dbh2->do('set global read_only=1');
 $sb->wipe_clean($dbh1);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/processlist.t

@@ -31,7 +31,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 3;
+   plan tests => 4;
 }
 
 my @args = qw(-F /tmp/12345/my.sandbox.cnf --processlist h=127.1 --report-format query_report);
@@ -75,4 +75,5 @@ ok(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

t/pt-query-digest/review.t

@@ -26,7 +26,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 18;
+   plan tests => 19;
 }
 
 my $run_with = "$trunk/bin/pt-query-digest --report-format=query_report --limit 10 $trunk/t/lib/samples/slowlogs/";
@@ -380,4 +380,5 @@ unlike(
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;