diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-06-18 23:10:41 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-06-18 23:10:41 -0400 |
| commit | 843644aed6477b4411ec3f07d1a5271df41c9798 (patch) | |
| tree | cb0d1cfaf7a0542004416f536a12583d2b710d34 /nova/tests | |
| parent | cf751516b6d7381fca5f0678c07baaa0f7fccece (diff) | |
General cleanup and refactor of a lot of the API/WSGI service code.
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/integrated/integrated_helpers.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py index 522c7cb0e..ba6bef62f 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/integrated/integrated_helpers.py @@ -171,15 +171,14 @@ class _IntegratedTestBase(test.TestCase): self.api = self.user.openstack_api def _start_api_service(self): - api_service = service.ApiService.create() - api_service.start() + #ec2 = service.WSGIService("ec2") + #ec2.start() - if not api_service: - raise Exception("API Service was None") + osapi = service.WSGIService("osapi") + osapi.start() - self.api_service = api_service - - host, port = api_service.get_socket_info('osapi') + host = osapi.server.host + port = osapi.server.port self.auth_url = 'http://%s:%s/v1.1' % (host, port) def tearDown(self): |