From d0c089fbe8532a939663379646ca95c88ad9bbbc Mon Sep 17 00:00:00 2001 From: Sergey Skripnick Date: Wed, 29 May 2013 13:44:38 +0300 Subject: [PATCH] InvalidUUID can not be raised There is incomplete format in exception's message. Fixes: bug 1184870 Change-Id: I27f231c8c5cb41b1ec5fdb34fba6a8dff6a556c7 --- cinder/exception.py | 2 +- cinder/tests/test_db_api.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cinder/exception.py b/cinder/exception.py index 551979f39f1..ef20438ddef 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 39bac7ec6c9..816d9d5d989 100644 --- 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')