diff options
| author | Brian Elliott <bdelliott@gmail.com> | 2013-05-09 21:07:27 +0000 |
|---|---|---|
| committer | Brian Elliott <bdelliott@gmail.com> | 2013-05-13 13:28:58 +0000 |
| commit | d8e4c91ebf589583ac79291de7a5e2c3f033962b (patch) | |
| tree | a444f2ae9a3082f3615c7b05a9ac18876bffea57 /nova/tests | |
| parent | c39687edb9138c6eac675b8781a5d4bf5a51c968 (diff) | |
| download | nova-d8e4c91ebf589583ac79291de7a5e2c3f033962b.tar.gz nova-d8e4c91ebf589583ac79291de7a5e2c3f033962b.tar.xz nova-d8e4c91ebf589583ac79291de7a5e2c3f033962b.zip | |
Convert Nova to use Oslo service infrastructure.
Convert Nova to use the Oslo versions of:
* Service
* Launchers
Also add Service timers to the Service ThreadGroup.
blueprint use-oslo-services
Change-Id: Id8ab017f4525afd69fed322311f2d5cc3b6d6f98
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/integrated/test_multiprocess_api.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_service.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nova/tests/integrated/test_multiprocess_api.py b/nova/tests/integrated/test_multiprocess_api.py index c85a43a0c..2610cdcb7 100644 --- a/nova/tests/integrated/test_multiprocess_api.py +++ b/nova/tests/integrated/test_multiprocess_api.py @@ -54,8 +54,8 @@ class MultiprocessWSGITest(integrated_helpers._IntegratedTestBase): # os._exit() which doesn't have this problem. status = 0 try: - launcher = service.ProcessLauncher() - launcher.launch_server(self.osapi, workers=self.osapi.workers) + launcher = service.process_launcher() + launcher.launch_service(self.osapi, workers=self.osapi.workers) launcher.wait() except SystemExit as exc: status = exc.code diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index 2cbc82fda..3ca6d7bc1 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -201,7 +201,6 @@ class TestLauncher(test.TestCase): self.service = service.WSGIService("test_service") def test_launch_app(self): - launcher = service.Launcher() - launcher.launch_server(self.service) + service.serve(self.service) self.assertNotEquals(0, self.service.port) - launcher.stop() + service._launcher.stop() |