From 2034823b958e655991d788e60314e007881251a4 Mon Sep 17 00:00:00 2001
From: Brian Fraser <brian.fraser@percona.com>
Date: Wed, 6 Mar 2013 14:21:29 -0300
Subject: [PATCH] Fix broken tests

---
 t/pt-query-digest/option_sanity.t             |  2 +-
 .../samples/slow019_report_noza.txt           | 52 -------------------
 t/pt-query-digest/slowlog_analyses.t          |  8 ---
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 t/pt-query-digest/samples/slow019_report_noza.txt

diff --git a/t/pt-query-digest/option_sanity.t b/t/pt-query-digest/option_sanity.t
index 26c6abe9..07f481f8 100644
--- a/t/pt-query-digest/option_sanity.t
+++ b/t/pt-query-digest/option_sanity.t
@@ -58,7 +58,7 @@ like $output,
 # We removed --statistics, but they should still print out if we use PTDEBUG.
 
 $output = qx{PTDEBUG=1 $cmd --no-report ${sample}slow002.txt 2>&1};
-my $stats = slurp_file("t/pt-query-digest/samples/stats-slow002.txt");
+my $stats = load_file("t/pt-query-digest/samples/stats-slow002.txt");
 
 like(
    $output,
diff --git a/t/pt-query-digest/samples/slow019_report_noza.txt b/t/pt-query-digest/samples/slow019_report_noza.txt
deleted file mode 100644
index fb1683d8..00000000
--- a/t/pt-query-digest/samples/slow019_report_noza.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-# Query 1: 0 QPS, 0x concurrency, ID 0xAA353644DE4C4CB4 at byte 435 ______
-# This item is included in the report because it matches --limit.
-# Scores: V/M = 0.02
-# Attribute    pct   total     min     max     avg     95%  stddev  median
-# ============ === ======= ======= ======= ======= ======= ======= =======
-# Count         66       2
-# Exec time     95    19ms     2us    19ms     9ms    19ms    13ms     9ms
-# Lock time    100     9ms       0     9ms     5ms     9ms     7ms     5ms
-# Rows sent    100      14       5       9       7       9    2.83       7
-# Rows examine  62       5       2       3    2.50       3    0.71    2.50
-# Query size    79      54      27      27      27      27       0      27
-# String:
-# Databases    db1 (1/50%), db2 (1/50%)
-# Hosts
-# Users        meow
-# Query_time distribution
-#   1us  ################################################################
-#  10us
-# 100us
-#   1ms
-#  10ms  ################################################################
-# 100ms
-#    1s
-#  10s+
-administrator command: Quit\G
-
-# Query 2: 0 QPS, 0x concurrency, ID 0xCC47B42511EA22DD at byte 221 ______
-# This item is included in the report because it matches --limit.
-# Scores: V/M = 0.00
-# Attribute    pct   total     min     max     avg     95%  stddev  median
-# ============ === ======= ======= ======= ======= ======= ======= =======
-# Count         33       1
-# Exec time      4   899us   899us   899us   899us   899us       0   899us
-# Lock time      0       0       0       0       0       0       0       0
-# Rows sent      0       0       0       0       0       0       0       0
-# Rows examine  37       3       3       3       3       3       0       3
-# Query size    20      14      14      14      14      14       0      14
-# String:
-# Databases    db
-# Hosts
-# Users        meow
-# Query_time distribution
-#   1us
-#  10us
-# 100us  ################################################################
-#   1ms
-#  10ms
-# 100ms
-#    1s
-#  10s+
-SET NAMES utf8\G
diff --git a/t/pt-query-digest/slowlog_analyses.t b/t/pt-query-digest/slowlog_analyses.t
index 2923b357..634eb4c5 100644
--- a/t/pt-query-digest/slowlog_analyses.t
+++ b/t/pt-query-digest/slowlog_analyses.t
@@ -204,14 +204,6 @@ ok(
    '--zero-admin works'
 );
 
-ok(
-   no_diff(
-      sub { pt_query_digest::main(@args, $sample.'slow019.txt', qw(--nozero-admin)) },
-      "t/pt-query-digest/samples/slow019_report_noza.txt"
-   ),
-   '--nozero-admin works'
-);
-
 # This was fixed at some point by checking the fingerprint to see if the
 # query needed to be converted to a SELECT.
 ok(