Add back PerconaTest::slurp_file(). Put in scope in pt-index-usage. Sort MySQL instance IDs for testing. Wait for pid file in pt-heartbeat/basics.t.

This commit is contained in:
Daniel Nichter
2012-08-28 15:28:34 -06:00
parent 8afb9ea5ff
commit a3950411b9
5 changed files with 14 additions and 7 deletions

View File

@@ -79,9 +79,10 @@ system("$cmd --daemonize -D test --update --run-time 3s --pid $pid_file 1>/dev/n
$output = `$ps_grep_cmd`;
like($output, qr/$cmd/, 'It is running');
PerconaTest::wait_for_files($pid_file);
ok(-f $pid_file, 'PID file created');
my ($pid) = $output =~ /^\s*(\d+)\s+/;
$output = `cat $pid_file`;
$output = `cat $pid_file` if -f $pid_file;
is($output, $pid, 'PID file has correct PID');
$output = `$cmd -D test --monitor --run-time 1s`;