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

PT-118 Updated tests for pt-table-checksum/error_handling.t

Browse Source
This commit is contained in:
Carlos Salguero
2018-05-07 15:11:33 -03:00
parent 117292b897
commit 0501558a2e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Percona/Test.pm
View File

@@ -662,9 +662,9 @@ my %checksum_result_col = (
rows => 3,
diff_rows => 4,
chunks => 5,
skipped => 6,
time => 7,
table => 8,
skipped => 5,
time => 6,
table => 7,
);
sub count_checksum_results {
my ($output, $column, $table) = @_;
@@ -697,7 +697,7 @@ sub normalize_checksum_results {
open my $fh, ">", $tmp_file or die "Cannot open $tmp_file: $OS_ERROR";
printf $fh $output;
close $fh;
my $normal_output = `cat $tmp_file | awk '/^[0-9 ]/ {print \$2 " " \$3 " " \$4 " " \$5 " " \$6 " " \$8} /^[A-Z]/ {print \$0}'`;
my $normal_output = `cat $tmp_file | awk '/^[0-9 ]/ {print \$2 " " \$3 " " \$4 " " \$5 " " \$6 " " \$7 " " \$9} /^[A-Z]/ {print \$0}'`;
`rm $tmp_file >/dev/null`;
return $normal_output;
}

4
lib/PerconaTest.pm
View File

@@ -700,7 +700,7 @@ my %checksum_result_col = (
chunks => 5,
skipped => 6,
time => 7,
table => 8,
table => 7,
);
sub count_checksum_results {
my ($output, $column, $table) = @_;
@@ -733,7 +733,7 @@ sub normalize_checksum_results {
open my $fh, ">", $tmp_file or die "Cannot open $tmp_file: $OS_ERROR";
printf $fh $output;
close $fh;
my $normal_output = `cat $tmp_file | awk '/^[0-9 ]/ {print \$2 " " \$3 " " \$4 " " \$5 " " \$6 " " \$8} /^[A-Z]/ {print \$0}'`;
my $normal_output = `cat $tmp_file | awk '/^[0-9 ]/ {print \$2 " " \$3 " " \$4 " " \$5 " " \$6 " " \$7 " " \$9} /^[A-Z]/ {print \$0}'`;
if ( wantarray ) {
my $original_output = `cat $tmp_file`;
return $normal_output, $original_output;

12
t/pt-table-checksum/error_handling.t
View File

@@ -61,13 +61,13 @@ $output = output(
qw(--chunk-time 0 --chunk-size 100) ) },
stderr => 1,
);
#1
like(
$output,
qr/MySQL error 1265: Data truncated/,
"MySQL error 1265: Data truncated for column"
);
#2
my (@errors) = $output =~ m/error/;
is(
scalar @errors,
@@ -91,16 +91,16 @@ $output = output(
my $original_output;
($output, $original_output) = PerconaTest::normalize_checksum_results($output);
#3
like(
$original_output,
qr/Lock wait timeout exceeded/,
"Warns about lock wait timeout"
);
#4
like(
$output,
qr/^0 0 0 1 1 sakila.city/m,
qr/^0 0 0 0 1 1 sakila.city/m,
"Skips chunk that times out"
);
@@ -129,7 +129,7 @@ unlike(
like(
$output,
qr/^0 0 600 1 0 sakila.city/m,
qr/^0 0 600 0 1 0 sakila.city/m,
"Checksum retried after lock wait timeout"
);