From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Wed, 29 May 2013 10:44:38 +0000 (+0300)
Subject: InvalidUUID can not be raised
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d0c089fbe8532a939663379646ca95c88ad9bbbc;p=openstack-build%2Fcinder-build.git

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 551979f39..ef20438dd 100644
--- 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 39bac7ec6..816d9d5d9 100644
--- 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')