equal
deleted
inserted
replaced
4 from tempfile import mkdtemp |
4 from tempfile import mkdtemp |
5 import shutil |
5 import shutil |
6 |
6 |
7 from ngdatabase.mysql import Server, createConfig, Database |
7 from ngdatabase.mysql import Server, createConfig, Database |
8 |
8 |
9 from iro.model import schema |
9 from iro.model import schema, setEngine |
10 from iro.model.utils import WithSession |
10 from iro.model.utils import WithSession |
11 from iro.model.schema import Base |
11 from iro.model.schema import Base |
12 |
12 |
13 from iro.controller.pool import dbPool |
13 from iro.controller.pool import dbPool |
14 |
14 |
40 class ModuleData: |
40 class ModuleData: |
41 def __init__(self): |
41 def __init__(self): |
42 self.tdir = mkdtemp(prefix='iro-mysql-') |
42 self.tdir = mkdtemp(prefix='iro-mysql-') |
43 self.server = Server('%s/my.cnf'%self.tdir) |
43 self.server = Server('%s/my.cnf'%self.tdir) |
44 self.db = SampleDatabase("test","test",'%s/my.cnf'%self.tdir) |
44 self.db = SampleDatabase("test","test",'%s/my.cnf'%self.tdir) |
45 self.engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%self.tdir, |
45 self.engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%self.tdir, |
46 poolclass = pool.SingletonThreadPool, pool_size=dbPool.maxthreads, )#echo=True) |
46 poolclass = pool.SingletonThreadPool, pool_size=dbPool.maxthreads, )#echo=True) |
47 |
47 |
48 def setUp(self): |
48 def setUp(self): |
49 with open('%s/my.cnf'%self.tdir,'w') as cnf: |
49 with open('%s/my.cnf'%self.tdir,'w') as cnf: |
50 cnf.write(createConfig(self.tdir)) |
50 cnf.write(createConfig(self.tdir)) |
51 self.server.create() |
51 self.server.create() |
52 self.server.start() |
52 self.server.start() |
53 self.db.create() |
53 self.db.create() |
54 Base.metadata.create_all(self.engine) |
54 Base.metadata.create_all(self.engine) |
|
55 setEngine(self.engine) |
55 |
56 |
56 def tearDown(self): |
57 def tearDown(self): |
57 self.server.stop() |
58 self.server.stop() |
58 shutil.rmtree(self.tdir) |
59 shutil.rmtree(self.tdir) |
59 |
60 |