percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-01 18:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the @INC shifts from the test files. This is no longer needed since the tools do their %INC mangling

Browse Source
This commit is contained in:
Brian Fraser
2012-11-21 13:58:40 -03:00
parent 7a51df2c35
commit d6a7bf0cdb
55 changed files with 0 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/pt-index-usage/basics.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
# See http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-index-usage";
use Sandbox;

2
t/pt-index-usage/save_results.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
# See http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-index-usage";
use Sandbox;

2
t/pt-query-advisor/checks.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 13;
use PerconaTest;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
require "$trunk/bin/pt-query-advisor";
my @args = qw(--print-all --report-format full --group-by none --query);

3
t/pt-query-advisor/get_create_table.t
View File

@@ -13,9 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
shift @INC;
require "$trunk/bin/pt-query-advisor";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-query-advisor/group_by.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 3;
use PerconaTest;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
require "$trunk/bin/pt-query-advisor";
ok(

2
t/pt-query-advisor/ignore_rules.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 1;
use PerconaTest;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
require "$trunk/bin/pt-query-advisor";
my @args = qw(--print-all --report-format full --group-by none);

2
t/pt-query-advisor/parse_logs.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 2;
use PerconaTest;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
require "$trunk/bin/pt-query-advisor";
my $output;

3
t/pt-query-advisor/review.t
View File

@@ -13,9 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
shift @INC;
require "$trunk/bin/pt-query-advisor";
my $dp = new DSNParser(opts=>$dsn_opts);

5
t/pt-query-digest/binlog_analyses.t
View File

@@ -12,11 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 2;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
# #############################################################################

4
t/pt-query-digest/bugs.t
View File

@@ -13,10 +13,6 @@ use Test::More;
use Sandbox;
use PerconaTest;
# See 101_slowlog_analyses.t for why we shift.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
shift @INC; # Sandbox
require "$trunk/bin/pt-query-digest";

2
t/pt-query-digest/continue_on_error.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 3;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my $output;

4
t/pt-query-digest/execute.t
View File

@@ -13,10 +13,6 @@ use Test::More;
use Sandbox;
use PerconaTest;
# See 101_slowlog_analyses.t for why we shift.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
shift @INC; # Sandbox
require "$trunk/bin/pt-query-digest";

4
t/pt-query-digest/explain.t
View File

@@ -13,10 +13,6 @@ use Test::More;
use Sandbox;
use PerconaTest;
# See 101_slowlog_analyses.t for why we shift.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
shift @INC; # Sandbox
require "$trunk/bin/pt-query-digest";

4
t/pt-query-digest/genlog_analyses.t
View File

@@ -13,10 +13,6 @@ use Test::More tests => 4;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
# #############################################################################

2
t/pt-query-digest/issue_736.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 1;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
# #############################################################################

4
t/pt-query-digest/mysql_analyses.t
View File

@@ -13,10 +13,6 @@ use Test::More tests => 6;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my @args = qw(--type tcpdump --report-format=query_report --limit 10);

2
t/pt-query-digest/outliers.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 2;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my @args = qw(--report-format=query_report);

4
t/pt-query-digest/pglog_analyses.t
View File

@@ -13,10 +13,6 @@ use Test::More tests => 2;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
# #############################################################################

4
t/pt-query-digest/prepared_statements_analyses.t
View File

@@ -13,10 +13,6 @@ use Test::More tests => 7;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my @args = qw(--type tcpdump --report-format=query_report --limit 10 --watch-server 127.0.0.1:12345);

3
t/pt-query-digest/processlist.t
View File

@@ -13,9 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC;
shift @INC;
shift @INC;
require "$trunk/bin/pt-query-digest";
use Data::Dumper;

4
t/pt-query-digest/rawlog_analyses.t
View File

@@ -13,10 +13,6 @@ use Test::More tests => 2;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
# #############################################################################

2
t/pt-query-digest/report_histogram.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 1;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my @args = ('--report-format', 'query_report,profile', qw(--limit 10));

3
t/pt-query-digest/review.t
View File

@@ -13,9 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC;
shift @INC;
shift @INC;
require "$trunk/bin/pt-query-digest";
my $dp = new DSNParser(opts=>$dsn_opts);

3
t/pt-query-digest/run_time.t
View File

@@ -14,9 +14,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
use Time::HiRes qw(sleep);
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
shift @INC; # Sandbox's unshift
require "$trunk/bin/pt-query-digest";
my $dp = new DSNParser(opts=>$dsn_opts);

11
t/pt-query-digest/slowlog_analyses.t
View File

@@ -13,17 +13,6 @@ use Test::More tests => 44;
use PerconaTest;
# Normally we want $trunk/common in @INC so we can "use MaakitTest" and
# other modules path-independently. However, mk-query-digest uses
# HTMLProtocolParser which is a subclass of ProtocolParser, so the former
# must "use base 'ProtocolParser'" which causes Perl to load ProtocolParser
# from @INC. This causes errors about ProtocolParser::new() being redefined:
# once in mk-query-digest's copy of the module and again from the actual
# module in $trunk/common. We remove $trunk/common from @INC so Perl won't
# find/load it again.\n
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
# #############################################################################

4
t/pt-query-digest/statistics.t
View File

@@ -13,10 +13,6 @@ use Test::More tests => 1;
use PerconaTest;
# See 101_slowlog_analyses.t or http://code.google.com/p/maatkit/wiki/Testing
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my @args = qw(--no-report --statistics);

2
t/pt-query-digest/variations.t
View File

@@ -13,8 +13,6 @@ use Test::More tests => 1;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";

2
t/pt-query-digest/verify_run_time.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 18;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-query-digest";
my $m = 60;

3
t/pt-table-checksum/basics.t
View File

@@ -21,9 +21,6 @@ use Data::Dumper;
use PerconaTest;
use Sandbox;
# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

3
t/pt-table-checksum/bugs.t
View File

@@ -21,9 +21,6 @@ use Data::Dumper;
use PerconaTest;
use Sandbox;
# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/char_chunking.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/chunk_index.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/chunk_size.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/create_replicate_table.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/error_handling.t
View File

@@ -15,8 +15,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/filters.t
View File

@@ -14,8 +14,6 @@ use Test::More;
use Data::Dumper;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/float_precision.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/fnv_64.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/ignore_columns.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/issue_388.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/issue_47.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/issue_602.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/option_sanity.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $output;

2
t/pt-table-checksum/privs.t
View File

@@ -22,8 +22,6 @@ use PerconaTest;
use Sandbox;
# Fix @INC because pt-table-checksum uses subclass OobNibbleIterator.
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/progress.t
View File

@@ -19,8 +19,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/replication_filters.t
View File

@@ -24,8 +24,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
use Data::Dumper;

2
t/pt-table-checksum/resume.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/run_time.t
View File

@@ -18,8 +18,6 @@ $Data::Dumper::Quotekeys = 0;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/skip_innodb.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349");

2
t/pt-table-checksum/standard_options.t
View File

@@ -13,8 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-table-checksum/throttle.t
View File

@@ -19,8 +19,6 @@ $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-tcp-model/analyses.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
shift @INC; # our unshift (above)
shift @INC; # PerconaTest's unshift
require "$trunk/bin/pt-tcp-model";

2
t/pt-variable-advisor/option_sanity.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More tests => 2;
use PerconaTest;
shift @INC; # These shifts are required for tools that use base and derived
shift @INC; # classes. See mk-query-digest/t/101_slowlog_analyses.t
require "$trunk/bin/pt-variable-advisor";
my $cmd = "$trunk/bin/pt-variable-advisor";

3
t/pt-variable-advisor/show_variables_online.t
View File

@@ -13,9 +13,6 @@ use Test::More;
use PerconaTest;
use Sandbox;
shift @INC; # These shifts are required for tools that use base and derived
shift @INC; # classes. See mk-query-digest/t/101_slowlog_analyses.t
shift @INC;
require "$trunk/bin/pt-variable-advisor";
my $dp = new DSNParser(opts=>$dsn_opts);

2
t/pt-variable-advisor/show_variables_static.t
View File

@@ -12,8 +12,6 @@ use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
shift @INC; # These two shifts are required for tools that use base and
shift @INC; # derived classes. See mk-query-digest/t/101_slowlog_analyses.t
require "$trunk/bin/pt-variable-advisor";
# #############################################################################