x/turbo-hipster
Code Issues Proposed changes

Fix tests

Browse Source
This commit is contained in:
Joshua Hesketh 2013-09-17 13:34:52 +10:00
parent 1217693a01
commit 123625ca51
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/etc/config.json
View File

@ -8,7 +8,13 @@
"jobs_working_dir": "/home/josh/var/lib/turbo-hipster/jobs", "jobs_working_dir": "/home/josh/var/lib/turbo-hipster/jobs",
"git_working_dir": "/home/josh/var/lib/turbo-hipster/git", "git_working_dir": "/home/josh/var/lib/turbo-hipster/git",
"pip_download_cache": "/home/josh/var/cache/pip", "pip_download_cache": "/home/josh/var/cache/pip",
"plugins": ["gate_real_db_upgrade"], "plugins": [
{
"name": "gate_real_db_upgrade",
"datasets_dir": "/home/josh/var/lib/turbo-hipster/datasets",
"gate": "build:gate-real-db-upgrade_nova_mysql"
}
],
"publish_logs": "publish_logs":
{ {
"type": "local", "type": "local",

9
tests/fakes.py
View File

@ -154,17 +154,18 @@ class FakeWorker(gear.Worker):
class FakeRealDbUpgradeRunner(RealDbUpgradeRunner): class FakeRealDbUpgradeRunner(RealDbUpgradeRunner):
def __init__(self, config, test): def __init__(self, global_config, plugin_config, test):
self.test = test self.test = test
super(FakeRealDbUpgradeRunner, self).__init__(config) super(FakeRealDbUpgradeRunner, self).__init__(global_config,
plugin_config)
def setup_gearman(self): def setup_gearman(self):
self.log.debug("Set up real_db gearman worker") self.log.debug("Set up real_db gearman worker")
self.gearman_worker = FakeWorker('FakeRealDbUpgradeRunner_worker', self.gearman_worker = FakeWorker('FakeRealDbUpgradeRunner_worker',
self.test) self.test)
self.gearman_worker.addServer( self.gearman_worker.addServer(
self.config['zuul_server']['gearman_host'], self.global_config['zuul_server']['gearman_host'],
self.config['zuul_server']['gearman_port'] self.global_config['zuul_server']['gearman_port']
) )
self.register_functions() self.register_functions()

3
tests/test_worker_manager.py
View File

@ -35,7 +35,8 @@ class TestGearmanManager(testtools.TestCase):
self.config['zuul_server']['gearman_port']) self.config['zuul_server']['gearman_port'])
self.config['zuul_server']['gearman_port'] = self.gearman_server.port self.config['zuul_server']['gearman_port'] = self.gearman_server.port
self.task = FakeRealDbUpgradeRunner(self.config, self) self.task = FakeRealDbUpgradeRunner(self.config,
self.config['plugins'][0], self)
self.tasks = dict(FakeRealDbUpgradeRunner_worker=self.task) self.tasks = dict(FakeRealDbUpgradeRunner_worker=self.task)
self.gearman_manager = FakeGearmanManager(self.config, self.gearman_manager = FakeGearmanManager(self.config,