diff --git a/t/pt-online-schema-change/skip_innodb.t b/t/pt-online-schema-change/skip_innodb.t index 08bbcc6d..7aeb9563 100644 --- a/t/pt-online-schema-change/skip_innodb.t +++ b/t/pt-online-schema-change/skip_innodb.t @@ -19,13 +19,13 @@ if ( $sandbox_version ge '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 $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); 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 ) { plan skip_all => 'Cannot connect to sandbox master 12348'; } diff --git a/t/pt-table-checksum/skip_innodb.t b/t/pt-table-checksum/skip_innodb.t index e1d0b953..4bd99354 100644 --- a/t/pt-table-checksum/skip_innodb.t +++ b/t/pt-table-checksum/skip_innodb.t @@ -19,11 +19,6 @@ 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(`$trunk/sandbox/stop-sandbox 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(`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 ) { plan skip_all => 'Cannot connect to sandbox master 12348'; }