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

merge upstream

Browse Source
This commit is contained in:
baron@percona.com
2012-02-02 11:09:14 -05:00
parent 8b2b3f3495 fe125e9cfb
commit c7be438fe2
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/pt-slave-find/pt-slave-find.t
View File

@@ -17,16 +17,12 @@ require "$trunk/bin/pt-slave-find";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1');
# Create slave2 as slave of slave1.
diag(`/tmp/12347/stop >/dev/null 2>&1`);
diag(`rm -rf /tmp/12347 >/dev/null 2>&1`);
diag(`$trunk/sandbox/test-env reset`);
diag(`$trunk/sandbox/start-sandbox slave 12347 12346 >/dev/null`);
my $master_dbh = $sb->get_dbh_for('master');
my $slave_dbh = $sb->get_dbh_for('slave1');
my $slave_2_dbh = $sb->get_dbh_for('slave2');
diag(`$trunk/sandbox/test-env reset`);
if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
}
@@ -114,6 +110,4 @@ is(
# Done.
# #############################################################################
diag(`rm -rf $outfile >/dev/null`);
diag(`/tmp/12347/stop >/dev/null`);
diag(`rm -rf /tmp/12347 >/dev/null`);
exit;

1
t/pt-upgrade/basics.t
View File

@@ -139,6 +139,7 @@ is_deeply(
# #############################################################################
# Done.
# #############################################################################
diag(`rm /tmp/left-outfile.txt /tmp/right-outfile.txt 2>/dev/null`);
$sb->wipe_clean($dbh1);
$sb->wipe_clean($dbh2);
exit;