Fix test counts.

This commit is contained in:
Daniel Nichter
2012-06-03 15:14:30 -04:00
parent 275ae93084
commit a64bf961e8
46 changed files with 46 additions and 46 deletions

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 17; use Test::More tests => 19;
use Sandbox; use Sandbox;
use OptionParser; use OptionParser;

View File

@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave'; plan skip_all => 'Cannot connect to sandbox slave';
} }
else { else {
plan tests => 14; plan tests => 13;
} }
my $cnf = '/tmp/12345/my.sandbox.cnf'; my $cnf = '/tmp/12345/my.sandbox.cnf';

View File

@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave'; plan skip_all => 'Cannot connect to sandbox slave';
} }
else { else {
plan tests => 4; plan tests => 3;
} }
my $cnf = '/tmp/12345/my.sandbox.cnf'; my $cnf = '/tmp/12345/my.sandbox.cnf';

View File

@@ -24,7 +24,7 @@ if ( !$dbh1 || !$dbh2 ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 11; plan tests => 10;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh1 ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 5; plan tests => 4;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 11; plan tests => 10;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $cnf = "/tmp/12345/my.sandbox.cnf"; my $cnf = "/tmp/12345/my.sandbox.cnf";

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $cnf = "/tmp/12345/my.sandbox.cnf"; my $cnf = "/tmp/12345/my.sandbox.cnf";

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 22; plan tests => 21;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 19; plan tests => 18;
} }
$sb->create_dbs($dbh, ['test']); $sb->create_dbs($dbh, ['test']);

View File

@@ -34,7 +34,7 @@ elsif ( !$slave2_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave2'; plan skip_all => 'Cannot connect to sandbox slave2';
} }
else { else {
plan tests => 30; plan tests => 29;
} }
$sb->create_dbs($master_dbh, ['test']); $sb->create_dbs($master_dbh, ['test']);

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
$sb->create_dbs($dbh, [qw(test)]); $sb->create_dbs($dbh, [qw(test)]);

View File

@@ -28,7 +28,7 @@ if ( !@{ $dbh->selectall_arrayref('show databases like "sakila"') } ) {
plan skip_all => "Sakila database is not loaded"; plan skip_all => "Sakila database is not loaded";
} }
else { else {
plan tests => 10; plan tests => 9;
} }
my $cnf = '/tmp/12345/my.sandbox.cnf'; my $cnf = '/tmp/12345/my.sandbox.cnf';

View File

@@ -28,7 +28,7 @@ if ( !@{ $dbh->selectall_arrayref('show databases like "sakila"') } ) {
plan skip_all => "Sakila database is not loaded"; plan skip_all => "Sakila database is not loaded";
} }
else { else {
plan tests => 19; plan tests => 18;
} }
my $cnf = '/tmp/12345/my.sandbox.cnf'; my $cnf = '/tmp/12345/my.sandbox.cnf';

View File

@@ -25,7 +25,7 @@ if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 5; plan tests => 4;
} }
my $output; my $output;

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 10; use Test::More tests => 9;
use PerconaTest; use PerconaTest;
use Sandbox; use Sandbox;

View File

@@ -29,7 +29,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 9; plan tests => 8;
} }
my $output; my $output;

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 16; use Test::More tests => 15;
use PerconaTest; use PerconaTest;
use Sandbox; use Sandbox;

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 7; use Test::More tests => 6;
use PerconaTest; use PerconaTest;
use Sandbox; use Sandbox;

View File

@@ -26,7 +26,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 5; plan tests => 4;
} }
my $output = ""; my $output = "";

View File

@@ -26,7 +26,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 6; plan tests => 5;
} }
my $output = ""; my $output = "";

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 5; plan tests => 4;
} }
my $run_with = "$trunk/bin/pt-query-digest --report-format=query_report --limit 10 $trunk/t/lib/samples/slowlogs/"; my $run_with = "$trunk/bin/pt-query-digest --report-format=query_report --limit 10 $trunk/t/lib/samples/slowlogs/";

View File

@@ -10,7 +10,7 @@ use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Time::HiRes qw(sleep); use Time::HiRes qw(sleep);
use Test::More tests => 8; use Test::More tests => 7;
use PerconaTest; use PerconaTest;
use Sandbox; use Sandbox;

View File

@@ -30,7 +30,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 7; plan tests => 6;
} }
my $output = ''; my $output = '';

View File

@@ -30,7 +30,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 7; plan tests => 6;
} }
my $sample = "t/pt-query-digest/samples/"; my $sample = "t/pt-query-digest/samples/";

View File

@@ -28,7 +28,7 @@ elsif ( !$vp->version_ge($dbh, '5.1.0') ) {
plan skip_all => 'Sandbox master version not >= 5.1'; plan skip_all => 'Sandbox master version not >= 5.1';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
# ############################################################################# # #############################################################################

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 4; plan tests => 3;
} }
# ############################################################################# # #############################################################################

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 4; plan tests => 3;
} }
$sb->create_dbs($dbh, ['test']); $sb->create_dbs($dbh, ['test']);

View File

@@ -31,7 +31,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 4; plan tests => 3;
} }
my @args = qw(-F /tmp/12345/my.sandbox.cnf --processlist h=127.1 --report-format query_report); my @args = qw(-F /tmp/12345/my.sandbox.cnf --processlist h=127.1 --report-format query_report);

View File

@@ -26,7 +26,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 19; plan tests => 18;
} }
my $run_with = "$trunk/bin/pt-query-digest --report-format=query_report --limit 10 $trunk/t/lib/samples/slowlogs/"; my $run_with = "$trunk/bin/pt-query-digest --report-format=query_report --limit 10 $trunk/t/lib/samples/slowlogs/";

View File

@@ -27,7 +27,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 12; plan tests => 11;
} }
my @args; my @args;

View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More tests => 11; use Test::More tests => 10;
use PerconaTest; use PerconaTest;
use Sandbox; use Sandbox;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $output; my $output;

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 4; plan tests => 3;
} }
$sb->wipe_clean($dbh); $sb->wipe_clean($dbh);

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 12; plan tests => 11;
} }
$sb->wipe_clean($dbh); $sb->wipe_clean($dbh);

View File

@@ -23,7 +23,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 6; plan tests => 5;
} }
$sb->wipe_clean($dbh); $sb->wipe_clean($dbh);

View File

@@ -33,7 +33,7 @@ elsif ( !$slave_2_dbh ) {
plan skip_all => 'Cannot connect to second sandbox slave'; plan skip_all => 'Cannot connect to second sandbox slave';
} }
else { else {
plan tests => 7; plan tests => 6;
} }
my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox'); my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox');

View File

@@ -27,7 +27,7 @@ elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave'; plan skip_all => 'Cannot connect to sandbox slave';
} }
else { else {
plan tests => 16; plan tests => 15;
} }
$sb->create_dbs($master_dbh, ['test']); $sb->create_dbs($master_dbh, ['test']);

View File

@@ -30,7 +30,7 @@ elsif ( !$dbh2 ) {
plan skip_all => 'Cannot connect to second sandbox master'; plan skip_all => 'Cannot connect to second sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox P=12348 --compare results,warnings --zero-query-times"; my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox P=12348 --compare results,warnings --zero-query-times";

View File

@@ -30,7 +30,7 @@ elsif ( !$dbh2 ) {
plan skip_all => 'Cannot connect to second sandbox master'; plan skip_all => 'Cannot connect to second sandbox master';
} }
else { else {
plan tests => 6; plan tests => 5;
} }
$sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql'); $sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql');

View File

@@ -30,7 +30,7 @@ elsif ( !$dbh2 ) {
plan skip_all => 'Cannot connect to second sandbox master'; plan skip_all => 'Cannot connect to second sandbox master';
} }
else { else {
plan tests => 3; plan tests => 2;
} }
$sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql'); $sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql');

View File

@@ -30,7 +30,7 @@ elsif ( !$dbh2 ) {
plan skip_all => 'Cannot connect to second sandbox master'; plan skip_all => 'Cannot connect to second sandbox master';
} }
else { else {
plan tests => 7; plan tests => 6;
} }
$sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql'); $sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql');

View File

@@ -26,7 +26,7 @@ if ( !$dbh ) {
plan skip_all => "Cannot connect to sandbox master"; plan skip_all => "Cannot connect to sandbox master";
} }
else { else {
plan tests => 4; plan tests => 3;
} }
# ############################################################################# # #############################################################################