From bb6e7a6c2e6a32a3309ae99c2e4dbba58af765fb Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Fri, 3 Jan 2014 16:00:36 -0500 Subject: [PATCH] Correctly handling glance verification exception --- tests/unit/test_glance_verifier.py | 6 +----- verifier/glance_verifier.py | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/unit/test_glance_verifier.py b/tests/unit/test_glance_verifier.py index e783038..2983b42 100644 --- a/tests/unit/test_glance_verifier.py +++ b/tests/unit/test_glance_verifier.py @@ -435,10 +435,6 @@ class GlanceVerifierTestCase(StacktachBaseTestCase): self.assertTrue(verified) def test_verify_exist_marks_exist_failed_if_field_mismatch_exception(self): - mock_logger = self._setup_mock_logger() - self.mox.StubOutWithMock(mock_logger, 'info') - mock_logger.exception("glance: Expected field to be 'expected' " - "got 'actual'") exist1 = self.mox.CreateMockAnything() exist2 = self.mox.CreateMockAnything() @@ -450,7 +446,7 @@ class GlanceVerifierTestCase(StacktachBaseTestCase): field_mismatch_exc = FieldMismatch('field', 'expected', 'actual') glance_verifier._verify_for_usage(exist1).AndRaise( exception=field_mismatch_exc) - exist1.mark_failed(reason='FieldMismatch') + exist1.mark_failed(reason="Expected field to be 'expected' got 'actual'") glance_verifier._verify_for_usage(exist2) glance_verifier._verify_for_delete(exist2) diff --git a/verifier/glance_verifier.py b/verifier/glance_verifier.py index 459b0a3..7e80973 100644 --- a/verifier/glance_verifier.py +++ b/verifier/glance_verifier.py @@ -136,6 +136,9 @@ def _verify(exists): _verify_validity(exist) exist.mark_verified() + except VerificationException, e: + verified = False + exist.mark_failed(reason=str(e)) except Exception, e: verified = False exist.mark_failed(reason=e.__class__.__name__)