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

Missing skips for the LOCAL INFILE issue

Browse Source
This commit is contained in:
Brian Fraser
2012-07-11 20:27:02 -03:00
parent e0d97bbc98
commit d43ad54b38
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
t/lib/CompareResults.t
+9 -2
View File
@@ -303,8 +303,10 @@ is_deeply(
# ############################################################################# # #############################################################################
# Test the rows method. # Test the rows method.
# ############################################################################# # #############################################################################
my $tmpdir = '/tmp/mk-upgrade-res'; my $tmpdir = '/tmp/mk-upgrade-res';
SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled, can't test method => rows", 30
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");
@@ -680,7 +682,7 @@ is(
$report, $report,
'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.
# ############################################################################# # #############################################################################
@@ -725,6 +727,9 @@ is_deeply(
'No differences after bad compare()' 'No differences after bad compare()'
); );
SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled, can't test method => rows", 2
if PerconaTest::load_data_is_disabled($dbh1);
$cr = new CompareResults( $cr = new CompareResults(
method => 'rows', method => 'rows',
'base-dir' => $tmpdir, 'base-dir' => $tmpdir,
@@ -754,6 +759,8 @@ is_deeply(
'No differences after bad compare()' 'No differences after bad compare()'
); );
}
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
t/pt-upgrade/warnings.t
+3
View File
@@ -24,12 +24,15 @@ my $dbh1 = $sb->get_dbh_for('master');
my $dbh2 = $sb->get_dbh_for('master1'); my $dbh2 = $sb->get_dbh_for('master1');
if ( !$dbh1 ) { if ( !$dbh1 ) {
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
elsif ( !$dbh2 ) { elsif ( !$dbh2 ) {
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
plan skip_all => 'Cannot connect to second sandbox master'; plan skip_all => 'Cannot connect to second sandbox master';
} }
elsif ( PerconaTest::load_data_is_disabled($dbh1) ) { elsif ( PerconaTest::load_data_is_disabled($dbh1) ) {
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
plan skip_all => 'LOAD DATA LOCAL INFILE is disabled'; plan skip_all => 'LOAD DATA LOCAL INFILE is disabled';
} }
else { else {