diff options
| author | mdietz <mdietz@openstack> | 2010-10-05 21:08:47 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-10-05 21:08:47 +0000 |
| commit | d58da66e2958ff3bb32c8f764c90526be5c601af (patch) | |
| tree | ea4c17996f06a326d3bd0149ea8d88e3135c172b | |
| parent | 8e89d47958fc0e680582804ec07152ca05039854 (diff) | |
| parent | 5f40379b407301c0907a72cde988197f3d18ea56 (diff) | |
| download | nova-d58da66e2958ff3bb32c8f764c90526be5c601af.tar.gz nova-d58da66e2958ff3bb32c8f764c90526be5c601af.tar.xz nova-d58da66e2958ff3bb32c8f764c90526be5c601af.zip | |
Cleans up a broken servers unit test
| -rw-r--r-- | nova/tests/api/rackspace/fakes.py | 16 | ||||
| -rw-r--r-- | nova/tests/api/rackspace/test_servers.py | 4 |
2 files changed, 1 insertions, 19 deletions
diff --git a/nova/tests/api/rackspace/fakes.py b/nova/tests/api/rackspace/fakes.py index c7d9216c8..b5fba2dfa 100644 --- a/nova/tests/api/rackspace/fakes.py +++ b/nova/tests/api/rackspace/fakes.py @@ -80,22 +80,6 @@ def stub_out_image_service(stubs): stubs.Set(nova.image.service.LocalImageService, 'show', fake_image_show) - -def stub_out_id_translator(stubs): - class FakeTranslator(object): - def __init__(self, id_type, service_name): - pass - - def to_rs_id(self, id): - return id - - def from_rs_id(self, id): - return id - - stubs.Set(nova.api.rackspace._id_translator, - 'RackspaceAPIIdTranslator', FakeTranslator) - - def stub_out_auth(stubs): def fake_auth_init(self, app): self.application = app diff --git a/nova/tests/api/rackspace/test_servers.py b/nova/tests/api/rackspace/test_servers.py index 1cc9ebc72..57040621b 100644 --- a/nova/tests/api/rackspace/test_servers.py +++ b/nova/tests/api/rackspace/test_servers.py @@ -58,7 +58,6 @@ class ServersTest(unittest.TestCase): fakes.stub_out_networking(self.stubs) fakes.stub_out_rate_limiting(self.stubs) fakes.stub_out_auth(self.stubs) - fakes.stub_out_id_translator(self.stubs) fakes.stub_out_key_pair_funcs(self.stubs) fakes.stub_out_image_service(self.stubs) self.stubs.Set(nova.db.api, 'instance_get_all', return_servers) @@ -73,7 +72,7 @@ class ServersTest(unittest.TestCase): req = webob.Request.blank('/v1.0/servers/1') res = req.get_response(nova.api.API()) res_dict = json.loads(res.body) - self.assertEqual(res_dict['server']['id'], '1') + self.assertEqual(res_dict['server']['id'], 1) self.assertEqual(res_dict['server']['name'], 'server1') def test_get_server_list(self): @@ -116,7 +115,6 @@ class ServersTest(unittest.TestCase): self.stubs.Set(nova.network.manager.VlanManager, 'allocate_fixed_ip', fake_method) - fakes.stub_out_id_translator(self.stubs) body = dict(server=dict( name='server_test', imageId=2, flavorId=2, metadata={}, personality = {} |