Merge "InvalidUUID can not be raised"

This commit is contained in:
Jenkins 2013-05-31 05:02:02 +00:00 committed by Gerrit Code Review
commit f30afa6e70
2 changed files with 1 additions and 2 deletions

View File

@ -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):

View File

@ -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')