percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't run binlog_tests unless MySQL 5.1+. Use output() instead of full_output().

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-26 16:52:24 -06:00
parent 302cb7f457
commit 3d03a3a0dc
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
t/pt-table-checksum/bugs.t
View File

@@ -180,9 +180,10 @@ is(
# https://bugs.launchpad.net/percona-toolkit/+bug/1016131 # https://bugs.launchpad.net/percona-toolkit/+bug/1016131
# ############################################################################# # #############################################################################
($output) = full_output( ($output) = output(
sub { pt_table_checksum::main(@args, '--tables', 'mysql.user,mysql.host', sub { pt_table_checksum::main(@args, '--tables', 'mysql.user,mysql.host',
'--columns', 'some_fale_column') }, '--columns', 'some_fale_column') },
stderr => 1,
); );
like( like(
@@ -196,30 +197,33 @@ like(
# https://bugs.launchpad.net/percona-toolkit/+bug/938068 # https://bugs.launchpad.net/percona-toolkit/+bug/938068
# ############################################################################# # #############################################################################
{ SKIP: {
diag("Adding two new slaves to master"); skip "binlog_format tests require MySQL 5.1 and newer", 2
local $ENV{BINLOG_FORMAT} = 'ROW'; unless $sandbox_version ge '5.1';
diag(`$trunk/sandbox/start-sandbox slave 12348 12345`);
local $ENV{BINLOG_FORMAT} = 'MIXED';
diag(`$trunk/sandbox/start-sandbox slave 12349 12348`);
$output = output( sub { pt_table_checksum::main(@args) }, stderr => 1 ); local $ENV{BINLOG_FORMAT} = 'ROW';
diag(`$trunk/sandbox/start-sandbox slave 12348 12345`);
local $ENV{BINLOG_FORMAT} = 'MIXED';
diag(`$trunk/sandbox/start-sandbox slave 12349 12348`);
my $re = qr/ has binlog_format .*? has binlog_format (\S+)\./msi; $output = output( sub { pt_table_checksum::main(@args) }, stderr => 1 );
like(
$output,
$re,
"Bug 938068: doesn't warn if binlog_format=row or mixed on slaves"
);
is_deeply( my $re = qr/ has binlog_format .*? has binlog_format (\S+)\./msi;
[ $output =~ /$re/g ], like(
[ 'ROW', 'MIXED' ], $output,
"...and warns for both level 1 and level 2 slaves" $re,
) or diag($output); "Bug 938068: doesn't warn if binlog_format=row or mixed on slaves"
);
diag(`$trunk/sandbox/stop-sandbox 12348 12349`); is_deeply(
[ $output =~ /$re/g ],
[ 'ROW', 'MIXED' ],
"...and warns for both level 1 and level 2 slaves"
) or diag($output);
diag(`$trunk/sandbox/stop-sandbox 12348 12349`);
} }
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################