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

Merged ubuntu-12-64-issues

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-07-30 11:30:05 -03:00
parent a7a4ff27aa 192f38498c
commit 2f0812fb33
33 changed files with 452 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
t/lib/CompareResults.t
View File

@@ -304,8 +304,10 @@ is_deeply(
# #############################################################################
# Test the rows method.
# #############################################################################
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`);
$sb->load_file('master', "t/lib/samples/compare-results.sql");
@@ -681,7 +683,7 @@ is(
$report,
'rows: report, left with more rows'
);
}
# #############################################################################
# Try to compare without having done the actions.
# #############################################################################
@@ -726,6 +728,9 @@ is_deeply(
'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(
method => 'rows',
'base-dir' => $tmpdir,
@@ -755,6 +760,8 @@ is_deeply(
'No differences after bad compare()'
);
}
# #############################################################################
# Done.
# #############################################################################

4
t/lib/Cxn.t
View File

@@ -114,7 +114,7 @@ my ($row) = $cxn->dbh()->selectrow_hashref('SHOW MASTER STATUS');
ok(
exists $row->{binlog_ignore_db},
"FetchHashKeyName = NAME_lc",
);
) or diag(Dumper($row));
test_var_val(
$cxn->dbh(),
@@ -163,7 +163,7 @@ $cxn->connect();
ok(
exists $row->{binlog_ignore_db},
"Reconnect FetchHashKeyName = NAME_lc",
);
) or diag(Dumper($row));
test_var_val(
$cxn->dbh(),

4
t/lib/DSNParser.t
View File

@@ -554,7 +554,7 @@ my ($out, undef) = full_output(sub { $dp->get_dbh(@opts, {}) });
like(
$out,
qr/\QUnknown character set/,
"get_dbh dies withg an unknown charset"
"get_dbh dies with an unknown charset"
);
$dp->prop('set-vars', "time_zoen='UTC'");
@@ -563,7 +563,7 @@ $dp->prop('set-vars', "time_zoen='UTC'");
like(
$out,
qr/\QUnknown system variable 'time_zoen'/,
"get_dbh dies withg an unknown charset"
"get_dbh dies with an unknown system variable"
);
# #############################################################################

9
t/lib/Daemon.t
View File

@@ -168,8 +168,8 @@ ok(
my (undef, $tempfile) = tempfile();
system("$cmd 5 --daemonize --log $log_file --pid $pid_file 2>$tempfile");
PerconaTest::wait_for_files($log_file, $pid_file);
system("$cmd 5 --daemonize --log $log_file --pid $pid_file > $tempfile 2>&1");
PerconaTest::wait_for_files($log_file, $pid_file, $tempfile);
$output = `ps wx | grep '$cmd 5' | grep -v grep`;
chomp(my $new_pid = slurp_file($pid_file));
@@ -203,7 +203,7 @@ diag(`rm $tempfile >/dev/null`);
# Check that it actually checks the running process.
# ############################################################################
rm_tmp_files();
system("$cmd 10 --daemonize --log $log_file --pid $pid_file");
system("$cmd 20 --daemonize --log $log_file --pid $pid_file");
PerconaTest::wait_for_files($pid_file, $log_file);
chomp($pid = slurp_file($pid_file));
$output = `$cmd 0 --daemonize --pid $pid_file 2>&1`;
@@ -213,6 +213,9 @@ like(
'Says that PID is running (issue 419)'
);
kill SIGKILL => $pid
if $pid;
sleep 1;
rm_tmp_files();

8
t/lib/MasterSlave.t
View File

@@ -9,7 +9,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More tests => 51;
use Test::More tests => 52;
use MasterSlave;
use DSNParser;
@@ -288,6 +288,12 @@ $ms->recurse_to_slaves(
skip_callback => $skip_callback,
});
is(
scalar(@slaves),
3,
"recurse to slaves finds all three slaves"
) or diag(Dumper(\@slaves));
is_deeply(
$ms->get_master_dsn( $slaves[0], undef, $dp ),
{ h => '127.0.0.1',

2
t/lib/bash/collect.sh
View File

@@ -23,7 +23,7 @@ p="$PT_TMPDIR/collect/2011_12_05"
# Default collect, no extras like gdb, tcpdump, etc.
collect "$PT_TMPDIR/collect" "2011_12_05" > $p-output 2>&1
wait_for_files "$p-hostname" "$p-opentables2" "$p-variables"
wait_for_files "$p-hostname" "$p-opentables2" "$p-variables" "$p-df"
# Even if this system doesn't have all the cmds, collect should still
# have created some files for cmds that (hopefully) all systems have.