percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-17 01:01:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
t/pt-online-schema-change/basics.t
View File

@@ -51,8 +51,8 @@ my $rows;
$sb->load_file('master', "$sample/basic_no_fks.sql");
$output = output(
sub { $exit = pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
($output, $exit) = full_output(
sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
'--alter', 'drop column id') }
);
@@ -139,11 +139,8 @@ sub test_alter_table {
unshift @$orig_tbls, [$new_tbl];
}
# TODO: output() is capturing if this call dies, so if a test
# causes it to die, the tests just stop without saying why, i.e.
# without re-throwing the error.
$output = output(
sub { $exit = pt_online_schema_change::main(
($output, $exit) = full_output(
sub { pt_online_schema_change::main(
@args,
'--print',
"$dsn,D=$db,t=$tbl",
@@ -575,8 +572,8 @@ sub test_table {
my $org_rows = $master_dbh->selectall_arrayref('select * from osc.t order by id');
$output = output(
sub { $exit = pt_online_schema_change::main(@args,
($output, $exit) = full_output(
sub { pt_online_schema_change::main(@args,
"$dsn,D=osc,t=t", qw(--execute --alter ENGINE=InnoDB)) },
stderr => 1,
);