Fixed json tetsts for pt-query-digest

This commit is contained in:
Carlos Salguero
2017-03-17 16:14:45 -03:00
parent d2c801eb26
commit bf2061310e
6 changed files with 14 additions and 10 deletions

View File

@@ -4,6 +4,7 @@ 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";
$ENV{PTTEST_PRETTY_JSON} = 1;
};
use strict;
@@ -22,6 +23,9 @@ my @args = qw(--output json);
my $sample = "$trunk/t/lib/samples";
my $results = "t/pt-query-digest/samples/json";
my $escaped_trunk = $trunk;
$escaped_trunk =~ s/\//\\\\\//g;
ok(
no_diff(
sub { pt_query_digest::main(@args, "$sample/slowlogs/empty") },
@@ -34,7 +38,7 @@ ok(
no_diff(
sub { pt_query_digest::main(@args, "$sample/slowlogs/slow002.txt") },
"$results/slow002.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
sed => [ qq/'s!$escaped_trunk!TRUNK!'/ ],
),
'json output for slow002'
) or diag($test_diff);
@@ -43,7 +47,7 @@ ok(
sub { pt_query_digest::main(qw(--no-vertical-format), @args,
"$sample/slowlogs/slow002.txt") },
"$results/slow002_no_vertical.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
sed => [ qq/'s!$escaped_trunk!TRUNK!'/ ],
),
'json output for slow002 with --no-vertical-format'
) or diag($test_diff);
@@ -53,7 +57,7 @@ ok(
sub { pt_query_digest::main(qw(--output json-anon),
"$sample/slowlogs/slow002.txt") },
"$results/slow002-anon.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
sed => [ qq/'s!$escaped_trunk!TRUNK!'/ ],
),
'json-anon output for slow002'
) or diag($test_diff);
@@ -62,7 +66,7 @@ ok(
sub { pt_query_digest::main(qw(--output json-anon --no-vertical-format),
"$sample/slowlogs/slow002.txt") },
"$results/slow002-anon_no_vertical.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
sed => [ qq/'s!$escaped_trunk!TRUNK!'/ ],
),
'json-anon output for slow002 with --no-vertical-format'
) or diag($test_diff);
@@ -74,7 +78,7 @@ ok(
sub { pt_query_digest::main(qw(--type tcpdump --limit 10 --watch-server 127.0.0.1:12345),
@args, "$sample/tcpdump/tcpdump021.txt") },
"$results/tcpdump021.txt",
sed => [ qq/'s!$trunk!TRUNK!'/ ],
sed => [ qq/'s!$escaped_trunk!TRUNK!'/ ],
),
'json output for for tcpdump021',
) or diag($test_diff);