From ba45d3597ef3a709d32a8b793a02ac599764c40e Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Wed, 11 Jul 2012 19:10:42 -0700 Subject: Remove deprecated auth from GlanceImageService * Drop the code block specific to deprecated auth in image deletion code * Remove reference to deprecated auth in the auth_strategy config option help text * Related to bp remove-deprecated-auth Change-Id: Id0f4f287d33d01d54642fbc544ada9b7ef1b83ec --- nova/tests/image/test_glance.py | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index 0518007c9..d6c9f8606 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -340,32 +340,6 @@ class TestGlanceImageService(test.TestCase): num_images = len(self.service.detail(self.context)) self.assertEquals(1, num_images) - def test_delete_not_by_owner(self): - # this test is only relevant for deprecated auth mode - self.flags(auth_strategy='deprecated') - - fixture = self._make_fixture(name='test image') - properties = {'project_id': 'proj1'} - fixture['properties'] = properties - - num_images = len(self.service.detail(self.context)) - self.assertEquals(0, num_images) - - image_id = self.service.create(self.context, fixture)['id'] - num_images = len(self.service.detail(self.context)) - self.assertEquals(1, num_images) - - proj_id = self.context.project_id - self.context.project_id = 'proj2' - - self.assertRaises(exception.NotAuthorized, self.service.delete, - self.context, image_id) - - self.context.project_id = proj_id - - num_images = len(self.service.detail(self.context)) - self.assertEquals(1, num_images) - def test_show_passes_through_to_client(self): fixture = self._make_fixture(name='image1', is_public=True) image_id = self.service.create(self.context, fixture)['id'] -- cgit