Merge "InvalidUUID can not be raised"

openstack · May 31, 2013 · f30afa6 · f30afa6
2 parents b113336 + d0c089f
commit f30afa6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -258,7 +258,6 @@ def test_volume_allocate_iscsi_target(self):
                                                  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')