diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-02 04:36:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-02 04:36:48 +0000 |
| commit | 1c5bb9d48dd33a166f65f5ea44cc5b822980ec4f (patch) | |
| tree | 8ea4570191fc0c91bbd5fc48e8766edc97827ed0 /nova/tests | |
| parent | f55182e21496dfcfc599d8075cedc428eecd33d1 (diff) | |
| parent | b860fc0254cbd6dcc9906ea516271ccd5e82215f (diff) | |
| download | nova-1c5bb9d48dd33a166f65f5ea44cc5b822980ec4f.tar.gz nova-1c5bb9d48dd33a166f65f5ea44cc5b822980ec4f.tar.xz nova-1c5bb9d48dd33a166f65f5ea44cc5b822980ec4f.zip | |
Merge "Remove unused nova.db.api:instance_get_all_by_reservation"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 7d41f7d8c..43b8bae15 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -71,19 +71,10 @@ def fake_gen_uuid(): return FAKE_UUID -def return_servers_by_reservation(context, reservation_id=""): - return [fakes.stub_instance(i + 1, - reservation_id=reservation_id) for i in xrange(5)] - - def return_servers_empty(context, *args, **kwargs): return [] -def return_servers_by_reservation_empty(context, reservation_id=""): - return [] - - def return_security_group(context, instance_id, security_group_id): pass @@ -539,9 +530,6 @@ class ServersControllerTest(test.TestCase): self.assertEqual(0, num_servers) def test_get_server_list_with_reservation_id(self): - self.stubs.Set(db, 'instance_get_all_by_reservation', - return_servers_by_reservation) - req = fakes.HTTPRequest.blank('/v2/fake/servers?reservation_id=foo') res_dict = self.controller.index(req) @@ -551,9 +539,6 @@ class ServersControllerTest(test.TestCase): i += 1 def test_get_server_list_with_reservation_id_empty(self): - self.stubs.Set(db, 'instance_get_all_by_reservation', - return_servers_by_reservation_empty) - req = fakes.HTTPRequest.blank('/v2/fake/servers/detail?' 'reservation_id=foo') res_dict = self.controller.detail(req) @@ -564,9 +549,6 @@ class ServersControllerTest(test.TestCase): i += 1 def test_get_server_list_with_reservation_id_details(self): - self.stubs.Set(db, 'instance_get_all_by_reservation', - return_servers_by_reservation) - req = fakes.HTTPRequest.blank('/v2/fake/servers/detail?' 'reservation_id=foo') res_dict = self.controller.detail(req) |