diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2013-09-17 13:34:52 +1000 |
|---|---|---|
| committer | Joshua Hesketh <josh@nitrotech.org> | 2013-09-17 13:34:52 +1000 |
| commit | 123625ca519086cf8306f86d102262c63d0f6d2b (patch) | |
| tree | 95d1fa8c7dd17d0977b571f4240073b5fcc9ce11 /tests | |
| parent | 1217693a018b06bf47cdb8ab9221a9dc481294c0 (diff) | |
| download | turbo-hipster-123625ca519086cf8306f86d102262c63d0f6d2b.tar.gz | |
Fix tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/etc/config.json | 8 | ||||
| -rw-r--r-- | tests/fakes.py | 9 | ||||
| -rw-r--r-- | tests/test_worker_manager.py | 3 |
3 files changed, 14 insertions, 6 deletions
diff --git a/tests/etc/config.json b/tests/etc/config.json index a04218b..b146205 100644 --- a/tests/etc/config.json +++ b/tests/etc/config.json @@ -8,7 +8,13 @@ "jobs_working_dir": "/home/josh/var/lib/turbo-hipster/jobs", "git_working_dir": "/home/josh/var/lib/turbo-hipster/git", "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": { "type": "local", diff --git a/tests/fakes.py b/tests/fakes.py index cf53121..0511bb2 100644 --- a/tests/fakes.py +++ b/tests/fakes.py @@ -154,17 +154,18 @@ class FakeWorker(gear.Worker): class FakeRealDbUpgradeRunner(RealDbUpgradeRunner): - def __init__(self, config, test): + def __init__(self, global_config, plugin_config, test): self.test = test - super(FakeRealDbUpgradeRunner, self).__init__(config) + super(FakeRealDbUpgradeRunner, self).__init__(global_config, + plugin_config) def setup_gearman(self): self.log.debug("Set up real_db gearman worker") self.gearman_worker = FakeWorker('FakeRealDbUpgradeRunner_worker', self.test) self.gearman_worker.addServer( - self.config['zuul_server']['gearman_host'], - self.config['zuul_server']['gearman_port'] + self.global_config['zuul_server']['gearman_host'], + self.global_config['zuul_server']['gearman_port'] ) self.register_functions() diff --git a/tests/test_worker_manager.py b/tests/test_worker_manager.py index a303d89..93acbb1 100644 --- a/tests/test_worker_manager.py +++ b/tests/test_worker_manager.py @@ -35,7 +35,8 @@ class TestGearmanManager(testtools.TestCase): self.config['zuul_server']['gearman_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.gearman_manager = FakeGearmanManager(self.config, |