Functional test and fix query time diffs.

bin/pt-upgrade

@@ -5523,7 +5523,7 @@ sub save_diffs {
            && scalar @{$class->{query_time_diffs}} < $self->max_examples ) {
          push @{$class->{query_time_diffs}}, [
             $query,
-            @$query_time_diffs,
+            $query_time_diffs,
          ];
       }
 
@@ -5982,10 +5982,13 @@ sub _format_rows {
 
 sub _format_query_times {
    my ($query_times) = @_;
-   return unless $query_times && @$query_times;
+   return unless $query_times;
-   my $fmt = "%s vs. %s seconds (%s increase)\n";
+   my $fmt = "\n%s vs. %s seconds (%s%% increase)\n";
-   return "\n" . 
+   my $diff = sprintf $fmt,
-   my @diffs;
+      ($query_times->[1] || '?'),
+      ($query_times->[2] || '?'),
+      ($query_times->[3] || '?');
+   return $diff;
 }
 
 sub _d {

lib/UpgradeResults.pm

@@ -64,7 +64,7 @@ sub save_diffs {
            && scalar @{$class->{query_time_diffs}} < $self->max_examples ) {
          push @{$class->{query_time_diffs}}, [
             $query,
-            @$query_time_diffs,
+            $query_time_diffs,
          ];
       }
 

t/pt-upgrade/query_time_diffs.t

@@ -0,0 +1,53 @@
+#!/usr/bin/env perl
+
+BEGIN {
+   die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+      unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+   unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+use File::Basename;
+
+$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1; 
+$ENV{PRETTY_RESULTS} = 1; 
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-upgrade";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh1 = $sb->get_dbh_for('host1');
+
+if ( !$dbh1 ) {
+   plan skip_all => 'Cannot connect to sandbox host1'; 
+}
+
+my $host1_dsn   = $sb->dsn_for('host1');
+my $samples     = "$trunk/t/pt-upgrade/samples";
+my $exit_status = 0;
+my $output;
+
+$output = output(
+   sub {
+      $exit_status = pt_upgrade::main($host1_dsn, "$samples/res001")
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_status,
+   4,
+   "Query time diff: exit 4"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($dbh1);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;

t/pt-upgrade/samples/res001/query

@@ -0,0 +1,2 @@
+select sleep(1)
+##

t/pt-upgrade/samples/res001/results

@@ -0,0 +1,6 @@
+$results = {
+  query_time => '0.010000',
+  warnings => {}
+};
+
+##

t/pt-upgrade/samples/res001/rows

@@ -0,0 +1,7 @@
+$rows = [
+  [
+    '0'
+  ]
+];
+
+##

t/pt-upgrade/samples/res001/sleep1.log

@@ -0,0 +1,3 @@
+# User@Host: root[root] @ localhost []
+# Query_time: 1  Lock_time: 0  Rows_sent: 7  Rows_examined: 7
+select sleep(1);