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

Update ComopareResults.t with new $can_load_data.

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-31 16:34:38 -06:00
parent 8b15e2936b
commit c769f4df11
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/lib/CompareResults.t
View File

@@ -42,9 +42,6 @@ if ( !$dbh1 ) {
elsif ( !$dbh2 ) { elsif ( !$dbh2 ) {
plan skip_all => "Cannot connect to sandbox slave"; plan skip_all => "Cannot connect to sandbox slave";
} }
else {
plan tests => 57;
}
Transformers->import(qw(make_checksum)); Transformers->import(qw(make_checksum));
@@ -306,8 +303,8 @@ is_deeply(
# ############################################################################# # #############################################################################
my $tmpdir = '/tmp/mk-upgrade-res'; my $tmpdir = '/tmp/mk-upgrade-res';
SKIP: { SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled, can't test method => rows", 30 skip "LOAD DATA LOCAL INFILE is disabled", 30 unless $can_load_data;
if PerconaTest::load_data_is_disabled($dbh1);
diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`); diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
$sb->load_file('master', "t/lib/samples/compare-results.sql"); $sb->load_file('master', "t/lib/samples/compare-results.sql");
@@ -684,6 +681,7 @@ is(
'rows: report, left with more rows' 'rows: report, left with more rows'
); );
} }
# ############################################################################# # #############################################################################
# Try to compare without having done the actions. # Try to compare without having done the actions.
# ############################################################################# # #############################################################################
@@ -729,8 +727,8 @@ is_deeply(
); );
SKIP: { SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled, can't test method => rows", 2 skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
if PerconaTest::load_data_is_disabled($dbh1);
$cr = new CompareResults( $cr = new CompareResults(
method => 'rows', method => 'rows',
'base-dir' => $tmpdir, 'base-dir' => $tmpdir,
@@ -781,4 +779,5 @@ diag(`rm -rf /tmp/*outfile.txt`);
$sb->wipe_clean($dbh1); $sb->wipe_clean($dbh1);
$sb->wipe_clean($dbh2); $sb->wipe_clean($dbh2);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit; exit;