From 1a16da7a6cd64565af6f304357807c8be1b3f0c3 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 30 Sep 2015 18:01:03 +0900 Subject: [PATCH] Remove remaining uses of load_admin_roles flag in tests Change-Id: I51a56233650ddece9d1ffaffc920bfdfd0d9f108 --- neutron/tests/unit/db/quota/test_api.py | 3 +-- neutron/tests/unit/db/test_db_base_plugin_v2.py | 2 +- neutron/tests/unit/extensions/test_quotasv2.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/neutron/tests/unit/db/quota/test_api.py b/neutron/tests/unit/db/quota/test_api.py index ea8b2aeea..15647f916 100644 --- a/neutron/tests/unit/db/quota/test_api.py +++ b/neutron/tests/unit/db/quota/test_api.py @@ -303,8 +303,7 @@ class TestQuotaDbApiAdminContext(TestQuotaDbApi): def _set_context(self): self.tenant_id = 'Higuain' self.context = context.Context('Gonzalo', self.tenant_id, - is_admin=True, is_advsvc=True, - load_admin_roles=False) + is_admin=True, is_advsvc=True) def test_get_quota_usage_by_resource(self): self._create_quota_usage('goals', 26) diff --git a/neutron/tests/unit/db/test_db_base_plugin_v2.py b/neutron/tests/unit/db/test_db_base_plugin_v2.py index dea0296ac..b9332976b 100644 --- a/neutron/tests/unit/db/test_db_base_plugin_v2.py +++ b/neutron/tests/unit/db/test_db_base_plugin_v2.py @@ -3749,7 +3749,7 @@ class TestSubnetsV2(NeutronDbPluginV2TestCase): def _test_validate_subnet_ipv6_pd_modes(self, cur_subnet=None, expect_success=True, **modes): plugin = manager.NeutronManager.get_plugin() - ctx = context.get_admin_context(load_admin_roles=False) + ctx = context.get_admin_context() new_subnet = {'ip_version': 6, 'cidr': constants.PROVISIONAL_IPV6_PD_PREFIX, 'enable_dhcp': True, diff --git a/neutron/tests/unit/extensions/test_quotasv2.py b/neutron/tests/unit/extensions/test_quotasv2.py index 8e0e55b34..e547920ca 100644 --- a/neutron/tests/unit/extensions/test_quotasv2.py +++ b/neutron/tests/unit/extensions/test_quotasv2.py @@ -348,7 +348,7 @@ class QuotaExtensionDbTestCase(QuotaExtensionTestCase): tenant_id = 'tenant_id1' self.assertRaises(exceptions.QuotaResourceUnknown, quota.QUOTAS.make_reservation, - context.get_admin_context(load_admin_roles=False), + context.get_admin_context(), tenant_id, {'foobar': 1}, plugin=None) @@ -357,7 +357,7 @@ class QuotaExtensionDbTestCase(QuotaExtensionTestCase): tenant_id = 'tenant_id1' self.assertRaises(exceptions.InvalidQuotaValue, quota.QUOTAS.make_reservation, - context.get_admin_context(load_admin_roles=False), + context.get_admin_context(), tenant_id, {'network': -1}, plugin=None) -- 2.45.2