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

Fix pt-heartbeat tests.

Browse Source
This commit is contained in:
Daniel Nichter
2012-02-01 10:36:00 -07:00
parent 4408123ea8
commit f68cc7a29b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,5 +137,6 @@ like(
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
diag(`rm /tmp/pt-heartbeat-sentinel 2>/dev/null`);
$sb->wipe_clean($dbh); $sb->wipe_clean($dbh);
exit; exit;

9
t/pt-heartbeat/multi_update_mode.t
View File

@@ -16,9 +16,7 @@ use PerconaTest;
use Sandbox; use Sandbox;
require "$trunk/bin/pt-heartbeat"; require "$trunk/bin/pt-heartbeat";
diag(`$trunk/sandbox/test-env reset`); # don't repl sakila db to 12347 diag(`$trunk/sandbox/test-env reset`);
diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
diag(`$trunk/sandbox/start-sandbox slave 12347 12346 >/dev/null`);
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);
@@ -225,6 +223,7 @@ $output = output(
sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox), sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
qw(-D test --check --print-master-server-id --master-server-id 42), qw(-D test --check --print-master-server-id --master-server-id 42),
qw(--no-insert-heartbeat-row)) }, qw(--no-insert-heartbeat-row)) },
stderr => 1,
); );
like( like(
@@ -246,11 +245,9 @@ foreach my $port (@ports) {
); );
} }
diag(`rm -rf /tmp/mk-heartbeat-sentinel >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null`);
$sb->wipe_clean($master_dbh); $sb->wipe_clean($master_dbh);
exit; exit;