diff --git a/glance/tests/unit/common/test_utils.py b/glance/tests/unit/common/test_utils.py index ed2a201a6b..e34c0b7f9c 100644 --- a/glance/tests/unit/common/test_utils.py +++ b/glance/tests/unit/common/test_utils.py @@ -15,6 +15,7 @@ import os import tempfile +import uuid import six import webob @@ -215,3 +216,15 @@ class TestUtils(test_utils.BaseTestCase): self.assertRaises(RuntimeError, utils.validate_key_cert, keyf.name, keyf.name) + + +class UUIDTestCase(test_utils.BaseTestCase): + + def test_is_uuid_like(self): + self.assertTrue(utils.is_uuid_like(str(uuid.uuid4()))) + + def test_id_is_uuid_like(self): + self.assertFalse(utils.is_uuid_like(1234567)) + + def test_name_is_uuid_like(self): + self.assertFalse(utils.is_uuid_like('zhongyueluo')) diff --git a/glance/tests/utils.py b/glance/tests/utils.py index 2dc58acb90..25e26adb18 100644 --- a/glance/tests/utils.py +++ b/glance/tests/utils.py @@ -22,7 +22,6 @@ import shlex import shutil import socket import subprocess -import uuid import fixtures from oslo.config import cfg @@ -34,7 +33,6 @@ import webob from glance.common import config from glance.common import exception from glance.common import property_utils -from glance.common import utils from glance.common import wsgi from glance import context from glance.db.sqlalchemy import api as db_api @@ -562,22 +560,3 @@ class HttplibWsgiAdapter(object): response = self.req.get_response(self.app) return FakeHTTPResponse(response.status_code, response.headers, response.body) - - -class UUIDTestCase(testtools.TestCase): - - def test_generate_uuid(self): - uuid_string = utils.generate_uuid() - self.assertIsInstance(uuid_string, str) - self.assertEqual(len(uuid_string), 36) - # make sure there are 4 dashes - self.assertEqual(len(uuid_string.replace('-', '')), 32) - - def test_is_uuid_like(self): - self.assertTrue(utils.is_uuid_like(str(uuid.uuid4()))) - - def test_id_is_uuid_like(self): - self.assertFalse(utils.is_uuid_like(1234567)) - - def test_name_is_uuid_like(self): - self.assertFalse(utils.is_uuid_like('zhongyueluo'))