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

This commit is contained in:
Daniel Nichter
2012-06-03 13:54:32 -04:00
parent cae983afc2
commit bdbb66d22b
178 changed files with 357 additions and 178 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;