← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to unit/TestReplServer.pm

Moved server handling to lib/DBServer

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit/TestReplServer.pm
18
18
package TestReplServer;
19
19
 
20
20
use base qw(Test::Unit::TestCase);
21
 
use lib 'lib';
 
21
use lib 'lib','lib/DBServer';
22
22
use Cwd;
23
 
use GenTest;
24
 
use GenTest::Server::ReplMySQLd;
 
23
use DBServer::DBServer;
 
24
use DBServer::MySQL::ReplMySQLd;
25
25
use GenTest::Executor;
26
26
 
27
27
use Data::Dumper;
63
63
    
64
64
    $self->assert(defined $ENV{RQG_MYSQL_BASE},"RQG_MYSQL_BASE not defined");
65
65
    
66
 
    my $server = GenTest::Server::ReplMySQLd->new(basedir => $ENV{RQG_MYSQL_BASE},
 
66
    my $server = DBServer::MySQL::ReplMySQLd->new(basedir => $ENV{RQG_MYSQL_BASE},
67
67
                                                  master_vardir => $master_vardir,
68
68
                                                  mode => 'statement',
69
69
                                                  master_port => $portbase);
102
102
    
103
103
    $self->assert(defined $ENV{RQG_MYSQL_BASE},"RQG_MYSQL_BASE not defined");
104
104
    
105
 
    my $master = GenTest::Server::MySQLd->new(basedir => $ENV{RQG_MYSQL_BASE},
 
105
    my $master = DBServer::MySQL::MySQLd->new(basedir => $ENV{RQG_MYSQL_BASE},
106
106
                                              vardir => $master_vardir,
107
107
                                              port => $portbase);
108
 
    my $slave = GenTest::Server::MySQLd->new(basedir => $ENV{RQG_MYSQL_BASE},
 
108
    my $slave = DBServer::MySQL::MySQLd->new(basedir => $ENV{RQG_MYSQL_BASE},
109
109
                                             vardir => $slave_vardir,
110
110
                                             port => $portbase+2);
111
111
    
112
 
    my $server = GenTest::Server::ReplMySQLd->new(slave => $slave,
 
112
    my $server = DBServer::MySQL::ReplMySQLd->new(slave => $slave,
113
113
                                                  master => $master,
114
114
                                                  mode => 'mixed');
115
115