Changeset 09640c94335c…
Parent d85e387b5944…
by
Changes to one file · Browse files at 09640c94335c Showing diff from parent d85e387b5944 Diff from another changeset...
|
|
@@ -42,11 +42,11 @@ def assertMissingMatch(self, haves, wants, expected):
for sha, path in self.store.find_missing_objects(haves, wants):
self.assertTrue(sha in expected,
- "FAILURE: (%s,%s) erroneously reported as missing" %
- (sha, path))
+ "(%s,%s) erroneously reported as missing" % (sha, path))
expected.remove(sha)
- self.assertFalse(len(expected) > 0, "FAILURE: some objects are not reported as missing: %s" % (expected))
+ self.assertEquals(len(expected), 0,
+ "some objects are not reported as missing: %s" % (expected, ))
class MOFLinearRepoTest(MissingObjectFinderTest):
@@ -59,13 +59,15 @@ f2_3 = make_object(Blob, data='f2-changed-again')
f3_2 = make_object(Blob, data='f3') # added in 2, left unmodified in 3
- commit_spec = [[1], [2,1], [3,2]]
- trees = {1: [('f1', f1_1), ('f2',f2_1)],
- 2: [('f1',f1_1), ('f2', f2_2), ('f3', f3_2)],
+ commit_spec = [[1], [2, 1], [3, 2]]
+ trees = {1: [('f1', f1_1), ('f2', f2_1)],
+ 2: [('f1', f1_1), ('f2', f2_2), ('f3', f3_2)],
3: [('f2', f2_3), ('f3', f3_2)] }
# commit 1: f1 and f2
- # commit 2: f3 added, f2 changed. Missing shall report commit id and a tree referenced by commit
- # commit 3: f1 removed, f2 changed. Commit sha and root tree sha shall be reported as modified
+ # commit 2: f3 added, f2 changed. Missing shall report commit id and a
+ # tree referenced by commit
+ # commit 3: f1 removed, f2 changed. Commit sha and root tree sha shall
+ # be reported as modified
self.commits = build_commit_graph(self.store, commit_spec, trees)
self.missing_1_2 = [self.cmt(2).id, self.cmt(2).tree, f2_2.id, f3_2.id]
self.missing_2_3 = [self.cmt(3).id, self.cmt(3).tree, f2_3.id]
@@ -73,7 +75,6 @@ self.cmt(2).id, self.cmt(3).id,
self.cmt(2).tree, self.cmt(3).tree,
f2_2.id, f3_2.id, f2_3.id]
-
def test_1_to_2(self):
self.assertMissingMatch([self.cmt(1).id], [self.cmt(2).id],
@@ -92,7 +93,8 @@ bogus_sha = self.cmt(2).id[::-1]
haves = [self.cmt(1).id, bogus_sha]
wants = [self.cmt(3).id]
- self.assertRaises(KeyError, self.store.find_missing_objects, self.store, haves, wants)
+ self.assertRaises(KeyError, self.store.find_missing_objects,
+ self.store, haves, wants)
def test_bogus_wants_failure(self):
"""Ensure non-existent SHA in wants are not tolerated"""
@@ -124,14 +126,16 @@ f2_3 = make_object(Blob, data='f2-3')
f3_3 = make_object(Blob, data='f3')
f3_5 = make_object(Blob, data='f3-5')
- commit_spec = [[1], [2,1], [3,2], [4,2], [5,3], [6,3,4], [7,6]]
- trees = {1: [('f1', f1_1), ('f2',f2_1)],
- 2: [('f1',f1_2), ('f2', f2_1)], # f1 changed
- 3: [('f1',f1_2), ('f2', f2_3), ('f3', f3_3)], # f3 added, f2 changed
- 4: [('f1',f1_4), ('f2',f2_1)], # f1 changed
- 5: [('f1',f1_2), ('f3', f3_5)], # f2 removed, f3 changed
- 6: [('f1',f1_4), ('f2',f2_3), ('f3', f3_3)], # merged 3 and 4
- 7: [('f1',f1_7), ('f2',f2_3)]} # f1 changed to match rev2. f3 removed
+ commit_spec = [[1], [2, 1], [3, 2], [4, 2], [5, 3], [6, 3, 4], [7, 6]]
+ trees = {1: [('f1', f1_1), ('f2', f2_1)],
+ 2: [('f1', f1_2), ('f2', f2_1)], # f1 changed
+ # f3 added, f2 changed
+ 3: [('f1', f1_2), ('f2', f2_3), ('f3', f3_3)],
+ 4: [('f1', f1_4), ('f2', f2_1)], # f1 changed
+ 5: [('f1', f1_2), ('f3', f3_5)], # f2 removed, f3 changed
+ 6: [('f1', f1_4), ('f2', f2_3), ('f3', f3_3)], # merged 3 and 4
+ # f1 changed to match rev2. f3 removed
+ 7: [('f1', f1_7), ('f2', f2_3)]}
self.commits = build_commit_graph(self.store, commit_spec, trees)
self.f1_2_id = f1_2.id
@@ -143,51 +147,45 @@ self.assertEquals(f1_2.id, f1_7.id, "[sanity]")
def test_have6_want7(self):
- """
- have 6, want 7. Ideally, shall not report f1_7 as it's the same as f1_2,
- however, to do so, MissingObjectFinder shall not record trees of common commits
- only, but also all parent trees and tree items, which is an overkill
- (i.e. in sha_done it records f1_4 as known, and doesn't record f1_2 was known
- prior to that, hence can't detect f1_7 is in fact f1_2 and shall not be reported)
- """
- self.assertMissingMatch([self.cmt(6).id], [self.cmt(7).id], [self.cmt(7).id, self.cmt(7).tree, self.f1_7_id])
+ # have 6, want 7. Ideally, shall not report f1_7 as it's the same as
+ # f1_2, however, to do so, MissingObjectFinder shall not record trees
+ # of common commits only, but also all parent trees and tree items,
+ # which is an overkill (i.e. in sha_done it records f1_4 as known, and
+ # doesn't record f1_2 was known prior to that, hence can't detect f1_7
+ # is in fact f1_2 and shall not be reported)
+ self.assertMissingMatch([self.cmt(6).id], [self.cmt(7).id],
+ [self.cmt(7).id, self.cmt(7).tree, self.f1_7_id])
def test_have4_want7(self):
- """
- have 4, want 7. Shall not include rev5 as it is not in the tree between 4 and 7
- (well, it is, but its SHA's are irrelevant for 4..7 commit hierarchy)
- """
+ # have 4, want 7. Shall not include rev5 as it is not in the tree
+ # between 4 and 7 (well, it is, but its SHA's are irrelevant for 4..7
+ # commit hierarchy)
self.assertMissingMatch([self.cmt(4).id], [self.cmt(7).id], [
self.cmt(7).id, self.cmt(6).id, self.cmt(3).id,
self.cmt(7).tree, self.cmt(6).tree, self.cmt(3).tree,
self.f2_3_id, self.f3_3_id])
def test_have1_want6(self):
- """
- have 1, want 6. Shall not include rev5
- """
+ # have 1, want 6. Shall not include rev5
self.assertMissingMatch([self.cmt(1).id], [self.cmt(6).id], [
self.cmt(6).id, self.cmt(4).id, self.cmt(3).id, self.cmt(2).id,
- self.cmt(6).tree, self.cmt(4).tree, self.cmt(3).tree, self.cmt(2).tree,
- self.f1_2_id, self.f1_4_id, self.f2_3_id, self.f3_3_id])
+ self.cmt(6).tree, self.cmt(4).tree, self.cmt(3).tree,
+ self.cmt(2).tree, self.f1_2_id, self.f1_4_id, self.f2_3_id,
+ self.f3_3_id])
def test_have3_want6(self):
- """
- have 3, want 7. Shall not report rev2 and its tree, because
- haves(3) means has parents, i.e. rev2, too
- BUT shall report any changes descending rev2 (excluding rev3)
- Shall NOT report f1_7 as it's techically == f1_2
- """
+ # have 3, want 7. Shall not report rev2 and its tree, because
+ # haves(3) means has parents, i.e. rev2, too
+ # BUT shall report any changes descending rev2 (excluding rev3)
+ # Shall NOT report f1_7 as it's techically == f1_2
self.assertMissingMatch([self.cmt(3).id], [self.cmt(7).id], [
self.cmt(7).id, self.cmt(6).id, self.cmt(4).id,
self.cmt(7).tree, self.cmt(6).tree, self.cmt(4).tree,
self.f1_4_id])
def test_have5_want7(self):
- """
- have 5, want 7. Common parent is rev2, hence children of rev2 from
- a descent line other than rev5 shall be reported
- """
+ # have 5, want 7. Common parent is rev2, hence children of rev2 from
+ # a descent line other than rev5 shall be reported
# expects f1_4 from rev6. f3_5 is known in rev5;
# f1_7 shall be the same as f1_2 (known, too)
self.assertMissingMatch([self.cmt(5).id], [self.cmt(7).id], [
|
Loading...