From dc6ef98a4b8f9cc2bd379e4e6583ceb5dec50b89 Mon Sep 17 00:00:00 2001 From: Rongze Zhu Date: Thu, 23 Aug 2012 03:31:36 +0000 Subject: [PATCH] Typo fix in glance: existant => existent Impact: * Test function names * Test strings and comments * Comment in glance/registry/api/v1/members.py Change-Id: I8cec84c4934c08905e7f8758dec3622a5261b153 --- glance/registry/api/v1/members.py | 2 +- glance/tests/unit/test_clients.py | 4 ++-- glance/tests/unit/v2/test_image_data_resource.py | 4 ++-- glance/tests/unit/v2/test_images_resource.py | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/glance/registry/api/v1/members.py b/glance/registry/api/v1/members.py index e5409e99fe..9eeebea8c0 100644 --- a/glance/registry/api/v1/members.py +++ b/glance/registry/api/v1/members.py @@ -156,7 +156,7 @@ class Controller(object): self.db_api.image_member_delete(req.context, memb, session=session) - # Now add the non-existant ones + # Now add the non-existent ones for memb in add: self.db_api.image_member_create(req.context, memb, session=session) diff --git a/glance/tests/unit/test_clients.py b/glance/tests/unit/test_clients.py index 39f0ef9d6b..2b4e2c70d3 100644 --- a/glance/tests/unit/test_clients.py +++ b/glance/tests/unit/test_clients.py @@ -1163,7 +1163,7 @@ class TestRegistryClient(base.IsolatedUnitTest): self.assertEquals(num_members, 0) def test_get_image_members_not_existing(self): - """Tests getting non-existant image members""" + """Tests getting non-existent image members""" self.assertRaises(exception.NotFound, self.client.get_image_members, _gen_uuid()) @@ -2099,7 +2099,7 @@ class TestClient(base.IsolatedUnitTest): self.assertEquals(num_members, 0) def test_get_image_members_not_existing(self): - """Tests getting non-existant image members""" + """Tests getting non-existent image members""" self.assertRaises(exception.NotFound, self.client.get_image_members, _gen_uuid()) diff --git a/glance/tests/unit/v2/test_image_data_resource.py b/glance/tests/unit/v2/test_image_data_resource.py index 7d3072d31f..de11d20216 100644 --- a/glance/tests/unit/v2/test_image_data_resource.py +++ b/glance/tests/unit/v2/test_image_data_resource.py @@ -47,7 +47,7 @@ class TestImagesController(base.StoreClearingUnitTest): self.assertRaises(webob.exc.HTTPNotFound, self.controller.download, request, unit_test_utils.UUID2) - def test_download_non_existant_image(self): + def test_download_non_existent_image(self): request = unit_test_utils.get_fake_request() self.assertRaises(webob.exc.HTTPNotFound, self.controller.download, request, utils.generate_uuid()) @@ -60,7 +60,7 @@ class TestImagesController(base.StoreClearingUnitTest): self.assertEqual(4, output['meta']['size']) self.assertEqual('YYYY', output['data']) - def test_upload_non_existant_image(self): + def test_upload_non_existent_image(self): request = unit_test_utils.get_fake_request() self.assertRaises(webob.exc.HTTPNotFound, self.controller.upload, request, utils.generate_uuid(), 'YYYY', 4) diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py index 0e15498d17..7f02e0071b 100644 --- a/glance/tests/unit/v2/test_images_resource.py +++ b/glance/tests/unit/v2/test_images_resource.py @@ -184,7 +184,7 @@ class TestImagesController(test_utils.BaseTestCase): expected = set([UUID1, UUID2, UUID3]) self.assertEqual(actual, expected) - def test_index_with_nonexistant_name_filter(self): + def test_index_with_nonexistent_name_filter(self): request = unit_test_utils.get_fake_request('/images?name=%s' % 'blah') images = self.controller.index(request, filters={'name': 'blah'})['images'] @@ -294,7 +294,7 @@ class TestImagesController(test_utils.BaseTestCase): self.assertEqual(UUID2, output['id']) self.assertEqual('2', output['name']) - def test_show_non_existant(self): + def test_show_non_existent(self): request = unit_test_utils.get_fake_request() image_id = utils.generate_uuid() self.assertRaises(webob.exc.HTTPNotFound, @@ -329,7 +329,7 @@ class TestImagesController(test_utils.BaseTestCase): self.assertEqual('image-2', output['name']) self.assertNotEqual(output['created_at'], output['updated_at']) - def test_update_non_existant(self): + def test_update_non_existent(self): request = unit_test_utils.get_fake_request() image = {'name': 'image-2'} self.assertRaises(webob.exc.HTTPNotFound, self.controller.update, @@ -348,7 +348,7 @@ class TestImagesController(test_utils.BaseTestCase): except Exception as e: self.fail("Delete raised exception: %s" % e) - def test_delete_non_existant(self): + def test_delete_non_existent(self): request = unit_test_utils.get_fake_request() self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete, request, utils.generate_uuid())