Changed all the pt-osc tests to use full_output, since output uses eval {}

This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-06-07 17:46:19 -03:00
parent e025b66bd2
commit ba2ddf682b
5 changed files with 15 additions and 21 deletions

View File

@@ -170,8 +170,8 @@ diag('Binlog position before altering table: ', $rows->{file}, '/', $rows->{posi
start_query_table(qw(pt_osc t id));
# While that's ^ happening, alter the table.
$output = output(
sub { $exit = pt_online_schema_change::main(
($output, $exit) = full_output(
sub { pt_online_schema_change::main(
"$master_dsn,D=pt_osc,t=t",
qw(--lock-wait-timeout 5),
qw(--print --execute --chunk-size 100 --alter ENGINE=InnoDB)) },
@@ -188,7 +188,7 @@ is(
$rows->{t}->{engine},
'InnoDB',
"New table ENGINE=InnoDB"
) or warn Dumper($rows);
) or BAIL_OUT("Something went terribly wrong");
is(
scalar keys %$rows,