InvalidUUID can not be raised

There is incomplete format in exception's message.

Fixes: bug 1184870
Change-Id: I27f231c8c5cb41b1ec5fdb34fba6a8dff6a556c7

diff --git a/cinder/exception.py b/cinder/exception.py
index 551979f39f1b3d6b6349593bd58f34484197bf73..ef20438ddefafb2782d22141fa820eb28c7a264e 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -216,7 +216,7 @@ class ImageUnacceptable(Invalid):
 
 
 class InvalidUUID(Invalid):
-    message = _("Expected a uuid but received %(uuid).")
+    message = _("Expected a uuid but received %(uuid)s.")
 
 
 class NotFound(CinderException):

diff --git a/cinder/tests/test_db_api.py b/cinder/tests/test_db_api.py
index 39bac7ec6c9f4a58d9d9efb1f676e1bbb8e61ad2..816d9d5d989393e3fa77669765177b19c59fdee0 100644 (file)
--- a/cinder/tests/test_db_api.py
+++ b/cinder/tests/test_db_api.py
@@ -258,7 +258,6 @@ class DBAPIVolumeTestCase(BaseTest):
                                                  host)
         self.assertEqual(target_num, 42)
 
-    @test.testtools.skip("bug 1184870")
     def test_volume_attached_invalid_uuid(self):
         self.assertRaises(exception.InvalidUUID, db.volume_attached, self.ctxt,
                           42, 'invalid-uuid', '/tmp')