percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix skip_innodb.t tests.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-19 07:53:19 -07:00
parent 3f8e1a4ea6
commit 7621d2c4ce
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,13 @@ if ( $sandbox_version ge '5.6' ) {
plan skip_all => 'Cannot disable InnoDB in MySQL 5.6'; plan skip_all => 'Cannot disable InnoDB in MySQL 5.6';
} }
diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
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';
} }

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

@@ -19,11 +19,6 @@ if ( $sandbox_version ge '5.6' ) {
plan skip_all => 'Cannot disable InnoDB in MySQL 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`);
@@ -31,6 +26,11 @@ 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';
} }