equal
deleted
inserted
replaced
9 |
9 |
10 import time |
10 import time |
11 |
11 |
12 from xmlrpclib import Server as xServer, ServerProxy, Fault |
12 from xmlrpclib import Server as xServer, ServerProxy, Fault |
13 |
13 |
14 from iro.model import POOL_SIZE as DB_POOL_SIZE |
14 from iro.controller.pool import dbPool |
15 |
15 |
16 from iro.model.schema import User, Base, Offer, Userright, Job, Message |
16 from iro.model.schema import User, Base, Offer, Userright, Job, Message |
17 |
17 |
18 from iro.main import runReactor |
18 from iro.main import runReactor |
19 |
19 |
252 def __init__(self): |
252 def __init__(self): |
253 self.tdir = mkdtemp(prefix='iro-mysql-') |
253 self.tdir = mkdtemp(prefix='iro-mysql-') |
254 self.server = Server('%s/my.cnf'%self.tdir) |
254 self.server = Server('%s/my.cnf'%self.tdir) |
255 self.db = SampleDatabase("test","test",'%s/my.cnf'%self.tdir) |
255 self.db = SampleDatabase("test","test",'%s/my.cnf'%self.tdir) |
256 self.engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%self.tdir, |
256 self.engine = create_engine('mysql://test:test@localhost/test?unix_socket=%s/socket'%self.tdir, |
257 poolclass = pool.SingletonThreadPool, pool_size=DB_POOL_SIZE, )#echo=True) |
257 poolclass = pool.SingletonThreadPool, pool_size=dbPool.maxthreads, )#echo=True) |
258 |
258 |
259 def setUp(self): |
259 def setUp(self): |
260 with open('%s/my.cnf'%self.tdir,'w') as cnf: |
260 with open('%s/my.cnf'%self.tdir,'w') as cnf: |
261 cnf.write(createConfig(self.tdir)) |
261 cnf.write(createConfig(self.tdir)) |
262 self.server.create() |
262 self.server.create() |