Fix pt-slave-find tests.

This commit is contained in:
Daniel Nichter
2012-02-02 09:00:07 -07:00
parent bacccfd431
commit e3f37fffc5

View File

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