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

Fix pt-query-digest mirror.t from previous merges.

Browse Source
This commit is contained in:
Daniel Nichter
2012-03-06 13:23:20 -07:00
parent b5160b4b71
commit df0f793815
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
t/pt-query-digest/mirror.t
View File

@@ -28,18 +28,14 @@ elsif ( !$dbh2 ) {
plan skip_all => 'Cannot connect to sandbox slave'; plan skip_all => 'Cannot connect to sandbox slave';
} }
else { else {
plan tests => 3; plan tests => 4;
} }
my $output; my $output;
my $cmd; my $cmd;
my $pid_file = "/tmp/pt-query-digest-mirror-test.pid"; my $pid_file = "/tmp/pt-query-digest-mirror-test.pid";
diag(`rm $pid_file 2>/dev/null`); diag(`rm $pid_file 2>/dev/null`);
my $pid_file = '/tmp/pt-query-digest.test.pid';
`rm -rf $pid_file >/dev/null`;
# ########################################################################## # ##########################################################################
# Tests for swapping --processlist and --execute # Tests for swapping --processlist and --execute
# ########################################################################## # ##########################################################################
@@ -74,10 +70,9 @@ is(
'', '',
'It is stopped now' 'It is stopped now'
); );
=======
$output = `ps -p $output`; $output = `ps -p $pid`;
unlike($output, qr/pt-query-digest/, 'It is stopped now'); unlike($output, qr/pt-query-digest/, 'It is stopped now');
>>>>>>> MERGE-SOURCE
$output = `grep read_only /tmp/read_only.txt`; $output = `grep read_only /tmp/read_only.txt`;
# Sample output: # Sample output: