=== modified file 't/pt-upgrade/basics.t' --- t/pt-upgrade/basics.t 2012-02-02 16:07:18 +0000 +++ t/pt-upgrade/basics.t 2012-02-25 15:32:37 +0000 @@ -16,12 +16,12 @@ require "$trunk/bin/pt-upgrade"; # This runs immediately if the server is already running, else it starts it. -diag(`$trunk/sandbox/start-sandbox master 12347 >/dev/null`); +diag(`$trunk/sandbox/start-sandbox master 2900 >/dev/null`); my $dp = new DSNParser(opts=>$dsn_opts); my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); my $dbh1 = $sb->get_dbh_for('master'); -my $dbh2 = $sb->get_dbh_for('slave2'); +my $dbh2 = $sb->get_dbh_for('master3'); if ( !$dbh1 ) { plan skip_all => 'Cannot connect to sandbox master'; @@ -34,9 +34,9 @@ } $sb->load_file('master', 't/pt-upgrade/samples/001/tables.sql'); -$sb->load_file('slave2', 't/pt-upgrade/samples/001/tables.sql'); +$sb->load_file('master3', 't/pt-upgrade/samples/001/tables.sql'); -my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox P=12347 --compare results,warnings --zero-query-times"; +my $cmd = "$trunk/bin/pt-upgrade h=127.1,P=12345,u=msandbox,p=msandbox P=2900 --compare results,warnings --zero-query-times"; my @args = ('--compare', 'results,warnings', '--zero-query-times'); my $sample = "$trunk/t/pt-upgrade/samples/"; @@ -93,7 +93,7 @@ # compare-results-method=rows # ############################################################################# $sb->load_file('master', 't/pt-upgrade/samples/002/tables.sql'); -$sb->load_file('slave2', 't/pt-upgrade/samples/002/tables.sql'); +$sb->load_file('master3', 't/pt-upgrade/samples/002/tables.sql'); # Make a difference so diff_rows() is called. $dbh1->do('insert into test.t values (5)'); @@ -101,7 +101,7 @@ ok( no_diff( sub { pt_upgrade::main(@args, - 'h=127.1,P=12345,u=msandbox,p=msandbox,D=test', 'P=12347,D=test', + 'h=127.1,P=12345,u=msandbox,p=msandbox,D=test', 'P=2900,D=test', "$sample/002/no-db.log", qw(--compare-results-method rows --temp-database test)) }, 't/pt-upgrade/samples/002/report-01.txt', @@ -110,13 +110,13 @@ ); $sb->load_file('master', 't/pt-upgrade/samples/002/tables.sql'); -$sb->load_file('slave2', 't/pt-upgrade/samples/002/tables.sql'); +$sb->load_file('master3', 't/pt-upgrade/samples/002/tables.sql'); $dbh1->do('insert into test.t values (5)'); ok( no_diff( sub { pt_upgrade::main(@args, - 'h=127.1,P=12345,u=msandbox,p=msandbox,D=test', 'P=12347,D=test', + 'h=127.1,P=12345,u=msandbox,p=msandbox,D=test', 'P=2900,D=test', "$sample/002/no-db.log", qw(--compare-results-method rows --temp-database tmp_db)) }, 't/pt-upgrade/samples/002/report-01.txt',