diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-04-23 16:21:08 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-04-23 16:21:08 +0000 |
commit | 28cfcd5020e6168f9de38978558683b528055be5 (patch) | |
tree | cd73cc839b7e09a3e67e909e3e8514cb969c06ee | |
parent | ce0a8778c322e092baf32613db035b8c9f4c3123 (diff) | |
parent | 3985c1e699d4598f6b95549a20f3b3a941a38bab (diff) | |
download | nova-28cfcd5020e6168f9de38978558683b528055be5.tar.gz nova-28cfcd5020e6168f9de38978558683b528055be5.tar.xz nova-28cfcd5020e6168f9de38978558683b528055be5.zip |
Merge "hypervisor tests more accurate db"
-rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_hypervisors.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_hypervisors.py b/nova/tests/api/openstack/compute/contrib/test_hypervisors.py index e323dce6a..7fc7f9ba2 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hypervisors.py +++ b/nova/tests/api/openstack/compute/contrib/test_hypervisors.py @@ -19,6 +19,7 @@ from webob import exc from nova.api.openstack.compute.contrib import hypervisors from nova import context from nova import db +from nova.db.sqlalchemy import api as db_api from nova import exception from nova import test from nova.tests.api.openstack import fakes @@ -79,6 +80,7 @@ TEST_SERVERS = [dict(name="inst1", uuid="uuid1", host="compute1"), dict(name="inst4", uuid="uuid4", host="compute2")] +@db_api.require_admin_context def fake_compute_node_get_all(context): return TEST_HYPERS @@ -185,7 +187,8 @@ class HypervisorsTest(test.TestCase): dict(name="inst4", uuid="uuid4")])) def test_index(self): - req = fakes.HTTPRequest.blank('/v2/fake/os-hypervisors') + req = fakes.HTTPRequest.blank('/v2/fake/os-hypervisors', + use_admin_context=True) result = self.controller.index(req) self.assertEqual(result, dict(hypervisors=[ @@ -193,7 +196,8 @@ class HypervisorsTest(test.TestCase): dict(id=2, hypervisor_hostname="hyper2")])) def test_detail(self): - req = fakes.HTTPRequest.blank('/v2/fake/os-hypervisors/detail') + req = fakes.HTTPRequest.blank('/v2/fake/os-hypervisors/detail', + use_admin_context=True) result = self.controller.detail(req) self.assertEqual(result, dict(hypervisors=[ |