From f4f381ab7f5e12cdfd2cbb1972ad3f04c162824a Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Mon, 1 Jul 2013 13:42:56 -0700 Subject: [PATCH] Move/rename JSON output samples. --- t/pt-query-digest/json.t | 8 ++++---- .../samples/{output_json_slow002.txt => json/slow002.txt} | 0 .../{output_json_tcpdump021.txt => json/tcpdump021.txt} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename t/pt-query-digest/samples/{output_json_slow002.txt => json/slow002.txt} (100%) rename t/pt-query-digest/samples/{output_json_tcpdump021.txt => json/tcpdump021.txt} (100%) diff --git a/t/pt-query-digest/json.t b/t/pt-query-digest/json.t index 663e6c09..11ee76e6 100644 --- a/t/pt-query-digest/json.t +++ b/t/pt-query-digest/json.t @@ -20,12 +20,12 @@ local $JSONReportFormatter::pretty_json = 1; my @args = qw(--output json); my $sample = "$trunk/t/lib/samples"; -my $results = "t/pt-query-digest/samples"; +my $results = "t/pt-query-digest/samples/json"; ok( no_diff( sub { pt_query_digest::main(@args, "$sample/slowlogs/empty") }, - "$results/empty_report.txt", + "t/pt-query-digest/samples/empty_report.txt", ), 'json output for empty log' ) or diag($test_diff); @@ -33,7 +33,7 @@ ok( ok( no_diff( sub { pt_query_digest::main(@args, "$sample/slowlogs/slow002.txt") }, - "$results/output_json_slow002.txt", + "$results/slow002.txt", sed => [ qq/'s!$trunk!TRUNK!'/ ], ), 'json output for slow002' @@ -45,7 +45,7 @@ ok( no_diff( sub { pt_query_digest::main(qw(--type tcpdump --limit 10 --watch-server 127.0.0.1:12345), @args, "$sample/tcpdump/tcpdump021.txt") }, - "$results/output_json_tcpdump021.txt", + "$results/tcpdump021.txt", sed => [ qq/'s!$trunk!TRUNK!'/ ], ), 'json output for for tcpdump021', diff --git a/t/pt-query-digest/samples/output_json_slow002.txt b/t/pt-query-digest/samples/json/slow002.txt similarity index 100% rename from t/pt-query-digest/samples/output_json_slow002.txt rename to t/pt-query-digest/samples/json/slow002.txt diff --git a/t/pt-query-digest/samples/output_json_tcpdump021.txt b/t/pt-query-digest/samples/json/tcpdump021.txt similarity index 100% rename from t/pt-query-digest/samples/output_json_tcpdump021.txt rename to t/pt-query-digest/samples/json/tcpdump021.txt