From 2a03e890b02ced6d43a9746da1e9c5291451bbcc Mon Sep 17 00:00:00 2001 From: Andrew Melton Date: Mon, 15 Jul 2013 13:17:21 -0400 Subject: [PATCH] Marking exists reconciled at proper location --- tests/unit/test_verifier_db.py | 10 ++++++---- verifier/dbverifier.py | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/unit/test_verifier_db.py b/tests/unit/test_verifier_db.py index af1980a..795528b 100644 --- a/tests/unit/test_verifier_db.py +++ b/tests/unit/test_verifier_db.py @@ -701,7 +701,7 @@ class VerifierTestCase(unittest.TestCase): self.assertFalse(result) self.mox.VerifyAll() - def test_verify_fail_reconcile_success(self): + def test_verify_fail_reconciled_verify_success(self): exist = self.mox.CreateMockAnything() exist.launched_at = decimal.Decimal('1.1') self.mox.StubOutWithMock(dbverifier, '_verify_for_launch') @@ -712,7 +712,7 @@ class VerifierTestCase(unittest.TestCase): dbverifier._verify_for_launch(exist).AndRaise(verify_exception) self.mox.StubOutWithMock(dbverifier, '_verify_with_reconciled_data') dbverifier._verify_with_reconciled_data(exist) - dbverifier._mark_exist_verified(exist, reconciled=True) + dbverifier._mark_exist_verified(exist) self.mox.ReplayAll() result, exists = dbverifier._verify(exist) self.assertTrue(result) @@ -943,8 +943,10 @@ class VerifierTestCase(unittest.TestCase): exists1 = self.mox.CreateMockAnything() exists2 = self.mox.CreateMockAnything() self.verifier.failed = [exists1, exists2] - self.reconciler.failed_validation(exists1) - self.reconciler.failed_validation(exists2) + self.reconciler.failed_validation(exists1).AndReturn(True) + self.reconciler.failed_validation(exists2).AndReturn(False) + self.mox.StubOutWithMock(dbverifier, '_mark_exist_verified') + dbverifier._mark_exist_verified(exists1, reconciled=True) self.mox.ReplayAll() self.verifier.reconcile_failed() self.assertEqual(len(self.verifier.failed), 0) diff --git a/verifier/dbverifier.py b/verifier/dbverifier.py index b8db64e..9361ff8 100644 --- a/verifier/dbverifier.py +++ b/verifier/dbverifier.py @@ -273,7 +273,7 @@ def _attempt_reconciled_verify(exist, orig_e): # Attempt to verify against reconciled data _verify_with_reconciled_data(exist) verified = True - _mark_exist_verified(exist, reconciled=True) + _mark_exist_verified(exist) except NotFound, rec_e: # No reconciled data, just mark it failed _mark_exist_failed(exist, reason=str(orig_e)) @@ -410,7 +410,8 @@ class Verifier(object): def reconcile_failed(self): for failed_exist in self.failed: - self.reconciler.failed_validation(failed_exist) + if self.reconciler.failed_validation(failed_exist): + _mark_exist_verified(failed_exist, reconciled=True) self.failed = [] def _keep_running(self):