percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a broken test and make another more resilient to future changes

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2013-01-24 12:11:11 -03:00
parent d1bdd4d80c
commit 457d61edfe
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-query-digest
View File

@@ -13593,7 +13593,7 @@ sub main {
for my $tables ('review-table', 'history-table') {
my $got = $o->get($tables);
if ( grep !defined, Quoter->split_unquote($got) ) {
$o->save_error("$tables should be passed a "
$o->save_error("--$tables should be passed a "
. "fully-qualified table name, got $got");
}
}

12
t/pt-query-digest/option_sanity.t
View File

@@ -16,11 +16,15 @@ use PerconaTest;
my $cmd = "$trunk/bin/pt-query-digest";
my $help = qx{$cmd --help};
my $output;
# #############################################################################
# Test cmd line op sanity.
# #############################################################################
my $output = `$cmd --review h=127.1,P=12345,u=msandbox,p=msandbox --review-table test`;
like($output, qr/--review-table requires a fully/, 'Dies if no database part in --review-table');
for my $opt (qw(review-table history-table)) {
$output = `$cmd --review h=127.1,P=12345,u=msandbox,p=msandbox --$opt test`;
like($output, qr/--$opt should be passed a/, "Dies if no database part in --$opt");
}
$output = `$cmd --review h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=test`;
like($output, qr/--review does not accept a t option/, 'Dies if t part in --review DSN');
@@ -100,8 +104,8 @@ like(
$help,
qr/\Q--report-format=A\E\s*
\QPrint these sections of the query analysis\E\s*
\Qreport (default rusage,date,hostname,files,\E\s*
\Qheader,profile,query_report,prepared)\E/x,
\Qreport (default rusage\E,\s*date,\s*hostname,\s*files,\s*
header,\s*profile,\s*query_report,\s*prepared\)/x,
"Bug 831525: pt-query-digest help output mangled"
);