diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay index 3414e7d9..d68b3da3 100755 --- a/bin/pt-slave-delay +++ b/bin/pt-slave-delay @@ -2592,7 +2592,6 @@ sub main { try => sub { return unless $oktorun; $status = $slave_dbh->selectrow_hashref("SHOW SLAVE STATUS"); - info("Reconnected to slave"); return $status; }, fail => sub { diff --git a/t/pt-slave-delay/standard_options.t b/t/pt-slave-delay/standard_options.t index 2ef343f7..d5f13eb9 100644 --- a/t/pt-slave-delay/standard_options.t +++ b/t/pt-slave-delay/standard_options.t @@ -31,8 +31,12 @@ my $output; my $cmd = "$trunk/bin/pt-slave-delay -F /tmp/12346/my.sandbox.cnf h=127.1"; my $pid_file = "/tmp/pt-slave-delay-test.$PID"; -# Check daemonization -system("$cmd --delay 1m --interval 1s --run-time 5s --daemonize --pid $pid_file 2>&1"); +# Check daemonization. This test used to print to STDOUT, causing +# false-positive test errors. The output isn't needed. The tool +# said "Reconnected to slave" every time it did SHOW SLAVE STATUS, +# so needlessly. That was removed. Now it will print stuff when +# we kill the process, which we don't want either. +system("$cmd --delay 1m --interval 1s --run-time 5s --daemonize --pid $pid_file >/dev/null 2>&1"); PerconaTest::wait_for_files($pid_file); chomp(my $pid = `cat $pid_file`); $output = `ps x | grep "^[ ]*$pid"`;