x/stacktach
Code Issues Proposed changes

Merge pull request #151 from ramielrowe/master

Browse Source 
Marking exists reconciled at proper location
This commit is contained in:
Andrew Melton 2013-07-15 10:18:01 -07:00
commit 4281133aac
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/test_verifier_db.py
View File

@ -701,7 +701,7 @@ class VerifierTestCase(unittest.TestCase):
self.assertFalse(result) self.assertFalse(result)
self.mox.VerifyAll() self.mox.VerifyAll()
def test_verify_fail_reconcile_success(self): def test_verify_fail_reconciled_verify_success(self):
exist = self.mox.CreateMockAnything() exist = self.mox.CreateMockAnything()
exist.launched_at = decimal.Decimal('1.1') exist.launched_at = decimal.Decimal('1.1')
self.mox.StubOutWithMock(dbverifier, '_verify_for_launch') self.mox.StubOutWithMock(dbverifier, '_verify_for_launch')
@ -712,7 +712,7 @@ class VerifierTestCase(unittest.TestCase):
dbverifier._verify_for_launch(exist).AndRaise(verify_exception) dbverifier._verify_for_launch(exist).AndRaise(verify_exception)
self.mox.StubOutWithMock(dbverifier, '_verify_with_reconciled_data') self.mox.StubOutWithMock(dbverifier, '_verify_with_reconciled_data')
dbverifier._verify_with_reconciled_data(exist) dbverifier._verify_with_reconciled_data(exist)
dbverifier._mark_exist_verified(exist, reconciled=True) dbverifier._mark_exist_verified(exist)
self.mox.ReplayAll() self.mox.ReplayAll()
result, exists = dbverifier._verify(exist) result, exists = dbverifier._verify(exist)
self.assertTrue(result) self.assertTrue(result)
@ -943,8 +943,10 @@ class VerifierTestCase(unittest.TestCase):
exists1 = self.mox.CreateMockAnything() exists1 = self.mox.CreateMockAnything()
exists2 = self.mox.CreateMockAnything() exists2 = self.mox.CreateMockAnything()
self.verifier.failed = [exists1, exists2] self.verifier.failed = [exists1, exists2]
self.reconciler.failed_validation(exists1) self.reconciler.failed_validation(exists1).AndReturn(True)
self.reconciler.failed_validation(exists2) 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.mox.ReplayAll()
self.verifier.reconcile_failed() self.verifier.reconcile_failed()
self.assertEqual(len(self.verifier.failed), 0) self.assertEqual(len(self.verifier.failed), 0)

5
verifier/dbverifier.py
View File

@ -273,7 +273,7 @@ def _attempt_reconciled_verify(exist, orig_e):
# Attempt to verify against reconciled data # Attempt to verify against reconciled data
_verify_with_reconciled_data(exist) _verify_with_reconciled_data(exist)
verified = True verified = True
_mark_exist_verified(exist, reconciled=True) _mark_exist_verified(exist)
except NotFound, rec_e: except NotFound, rec_e:
# No reconciled data, just mark it failed # No reconciled data, just mark it failed
_mark_exist_failed(exist, reason=str(orig_e)) _mark_exist_failed(exist, reason=str(orig_e))
@ -410,7 +410,8 @@ class Verifier(object):
def reconcile_failed(self): def reconcile_failed(self):
for failed_exist in self.failed: 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 = [] self.failed = []
def _keep_running(self): def _keep_running(self):