Fix --progress.

t/pt-upgrade/run_time.t

@@ -11,7 +11,8 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 use Time::HiRes qw(time);
-   
+use File::Temp qw(tempdir);
+
 $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
 
 use PerconaTest;
@@ -19,7 +20,7 @@ use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
 # This runs immediately if the server is already running, else it starts it.
-#diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -35,10 +36,15 @@ elsif ( !$dbh2 ) {
 
 my $host1_dsn   = $sb->dsn_for('host1');
 my $host2_dsn   = $sb->dsn_for('host2');
+my $tmpdir      = tempdir("/tmp/pt-upgrade.$PID.XXXXXX", CLEANUP => 1);
 my $samples     = "$trunk/t/pt-upgrade/samples";
 my $exit_status = 0;
 my $output;
 
+# #############################################################################
+# Executing queries
+# #############################################################################
+
 my $t0 = time;
 
 $output = output(
@@ -54,20 +60,56 @@ my $t = time - $t0;
 
 ok(
    $t >= 3 && $t <= 6,
-   "Ran for roughly --run-time seconds"
+   "Exec queries: ran for roughly --run-time seconds"
 ) or diag($output, 'Actual run time:', $t);
 
 # Exit status 8 = --run-time expired (an no other errors/problems)
 is(
    $exit_status,
    8,
-   "Exit status 8"
+   "Exec queries: exit status 8"
 ) or diag($output);
 
 like(
    $output,
-   qr/Executing queries.+?remain/,
-   "--progress while executing queries"
+   qr/slow_slow.log.+?remain/,
+   "Exec queries: --progress"
+);
+
+# #############################################################################
+# Saving results
+# #############################################################################
+
+$t0 = time;
+
+$output = output(
+   sub {
+      $exit_status = pt_upgrade::main($host1_dsn,
+         '--save-results', $tmpdir,
+         "$samples/slow_slow.log", qw(--run-time 3),
+         '--progress', 'time,1',
+   )},
+   stderr => 1,
+);
+
+$t = time - $t0;
+
+ok(
+   $t >= 3 && $t <= 6,
+   "Save results: ran for roughly --run-time seconds"
+) or diag($output, 'Actual run time:', $t);
+
+# Exit status 8 = --run-time expired (an no other errors/problems)
+is(
+   $exit_status,
+   8,
+   "Save results: exit status 8"
+) or diag($output);
+
+like(
+   $output,
+   qr/slow_slow.log.+?remain/,
+   "Save results: --progress"
 );
 
 # #############################################################################
@@ -75,6 +117,6 @@ like(
 # #############################################################################
 #$sb->wipe_clean($dbh2);
 $sb->wipe_clean($dbh1);
-#diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-#ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;

t/pt-upgrade/save_results.t

@@ -105,5 +105,6 @@ close $dh;
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh1);
+diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;