Update progress.t, option_sanity.t, and standard_options.t. Make test env always have slave2 (12347, slave of 12346). Add PerconaTest::count_checksum_results(). Add util/wait-to-exec.

This commit is contained in:
Daniel Nichter
2011-10-14 11:45:11 -06:00
parent 48fb4baa7c
commit 4ad88ddd93
11 changed files with 294 additions and 73 deletions
+2 -14
View File
@@ -42,21 +42,9 @@ $sb->load_file('master', 't/pt-table-checksum/samples/issue_94.sql');
PerconaTest::wait_for_table($slave_dbh, 'test.issue_94', 'a=11');
$slave_dbh->do("update test.issue_94 set c=''");
sub get_diffs {
my ($output) = @_;
my (@diffs) = $output =~ m/
^\S+\s+ # TS
\d+\s+ # ERRORS
(\d+) # DIFFS
/gmx;
my $total_diffs = 0;
map { $total_diffs += $_ } @diffs;
return $total_diffs;
}
$output = output(
sub { pt_table_checksum::main(@args, qw(-d test -t issue_94)) },
trf => \&get_diffs,
trf => sub { return PerconaTest::count_checksum_results(@_, 'DIFFS') },
);
is(
$output,
@@ -67,7 +55,7 @@ is(
$output = output(
sub { pt_table_checksum::main(@args, qw(-d test -t issue_94),
qw(--ignore-columns c)) },
trf => \&get_diffs,
trf => sub { return PerconaTest::count_checksum_results(@_, 'DIFFS') },
);
is(
$output,