percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-28 00:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip skip_innodb.t tests with 5.6 because it seems like InnoDB can't be disabled any longer.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-18 18:17:38 -07:00
parent eb2585fb32
commit 923e643b04
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/pt-online-schema-change/skip_innodb.t
View File

@@ -15,19 +15,20 @@ use PerconaTest;
use Sandbox; use Sandbox;
require "$trunk/bin/pt-online-schema-change"; require "$trunk/bin/pt-online-schema-change";
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`); if ( $sandbox_version ge '5.6' ) {
diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`); plan skip_all => 'Cannot disable InnoDB in MySQL 5.6';
}
my $dp = new DSNParser(opts=>$dsn_opts); my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master1'); my $master_dbh = $sb->get_dbh_for('master1');
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
if ( !$master_dbh ) { if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master 12348'; plan skip_all => 'Cannot connect to sandbox master 12348';
} }
else {
plan tests => 3;
}
my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox'; my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
my @args = (qw(--lock-wait-timeout 3), '--max-load', ''); my @args = (qw(--lock-wait-timeout 3), '--max-load', '');
@@ -55,4 +56,4 @@ is(
# ############################################################################# # #############################################################################
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`); diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
exit; done_testing;

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

@@ -15,6 +15,15 @@ use PerconaTest;
use Sandbox; use Sandbox;
require "$trunk/bin/pt-table-checksum"; require "$trunk/bin/pt-table-checksum";
if ( $sandbox_version ge '5.6' ) {
plan skip_all => 'Cannot disable InnoDB in MySQL 5.6';
}
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master1');
my $slave_dbh = $sb->get_dbh_for('master2');
diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349"); diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349");
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`); diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`); diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
@@ -22,20 +31,12 @@ diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`); diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox slave 12349 12348 >/dev/null`); diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox slave 12349 12348 >/dev/null`);
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master1');
my $slave_dbh = $sb->get_dbh_for('master2');
if ( !$master_dbh ) { if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master 12348'; plan skip_all => 'Cannot connect to sandbox master 12348';
} }
elsif ( !$slave_dbh ) { elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave 12349'; plan skip_all => 'Cannot connect to sandbox slave 12349';
} }
else {
plan tests => 3;
}
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --lock-wait-timeout=3 else the tool will die. # so we need to specify --lock-wait-timeout=3 else the tool will die.
@@ -65,8 +66,6 @@ is(
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
diag('Shutting down sandboxes'); diag(`$trunk/sandbox/stop-sandbox 12349 12348 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
exit; done_testing;