33
33
except bzrlib.errors.NoSuchRevision:
36
def fetch_steps(self, br_a, br_b, writable_a):
37
"""A foreign test method for testing fetch locally and remotely."""
40
return Branch.initialize(name)
38
class TestFetch(TestCaseInTempDir):
39
def SKIPPED_old_test_fetch(self):
40
"""obsolete: new commit code depends on parents being present
41
so the test data no longer suits this test."""
45
return Branch(name, init=True)
42
assert not has_revision(br_b, br_a.revision_history()[3])
43
assert has_revision(br_b, br_a.revision_history()[2])
44
assert len(br_b.revision_history()) == 7
45
assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
47
# greedy_fetch is not supposed to alter the revision history
48
assert len(br_b.revision_history()) == 7
49
assert not has_revision(br_b, br_a.revision_history()[3])
51
assert len(br_b.revision_history()) == 7
52
assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
53
assert has_revision(br_b, br_a.revision_history()[3])
54
assert not has_revision(br_a, br_b.revision_history()[6])
55
assert has_revision(br_a, br_b.revision_history()[5])
57
# When a non-branch ancestor is missing, it should be a failure, not
59
print ("CANNOT TEST MISSING NON REVISION_HISTORY ANCESTORS WITHOUT"
61
# br_a4 = new_branch('br_a4')
62
# count, failures = greedy_fetch(br_a4, br_a)
63
# self.assertEqual(count, 6)
64
# self.assertEqual(failures, set((br_b.revision_history()[4],
65
# br_b.revision_history()[5])))
67
self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
68
assert has_revision(br_a, br_b.revision_history()[3])
69
assert has_revision(br_a, br_b.revision_history()[4])
71
br_b2 = new_branch('br_b2')
72
assert greedy_fetch(br_b2, br_b)[0] == 7
73
assert has_revision(br_b2, br_b.revision_history()[4])
74
assert has_revision(br_b2, br_a.revision_history()[2])
75
assert not has_revision(br_b2, br_a.revision_history()[3])
77
br_a2 = new_branch('br_a2')
78
assert greedy_fetch(br_a2, br_a)[0] == 9
79
assert has_revision(br_a2, br_b.revision_history()[4])
80
assert has_revision(br_a2, br_a.revision_history()[3])
81
assert has_revision(br_a2, br_a.revision_history()[2])
83
br_a3 = new_branch('br_a3')
84
assert greedy_fetch(br_a3, br_a2)[0] == 0
85
for revno in range(4):
86
assert not has_revision(br_a3, br_a.revision_history()[revno])
87
self.assertEqual(greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0], 3)
88
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
89
assert fetched == 3, "fetched %d instead of 3" % fetched
90
# InstallFailed should be raised if the branch is missing the revision
92
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
94
# InstallFailed should be raised if the branch is missing a revision
95
# from its own revision history
96
br_a2.append_revision('a-b-c')
97
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
101
class TestFetch(TestCaseInTempDir):
103
def test_fetch(self):
105
47
#highest indices a: 5, b: 7
106
48
br_a, br_b = make_branches()
107
fetch_steps(self, br_a, br_b, br_a)
49
assert not has_revision(br_b, br_a.revision_history()[3])
50
assert has_revision(br_b, br_a.revision_history()[2])
51
assert len(br_b.revision_history()) == 7
52
assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
54
# greedy_fetch is not supposed to alter the revision history
55
assert len(br_b.revision_history()) == 7
56
assert not has_revision(br_b, br_a.revision_history()[3])
58
assert len(br_b.revision_history()) == 7
59
assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
60
assert has_revision(br_b, br_a.revision_history()[3])
61
assert not has_revision(br_a, br_b.revision_history()[3])
62
assert not has_revision(br_a, br_b.revision_history()[4])
64
# When a non-branch ancestor is missing, it should be a failure, not
66
br_a4 = new_branch('br_a4')
67
count, failures = greedy_fetch(br_a4, br_a)
69
assert failures == set((br_b.revision_history()[4],
70
br_b.revision_history()[5]))
72
assert greedy_fetch(br_a, br_b)[0] == 4
73
assert has_revision(br_a, br_b.revision_history()[3])
74
assert has_revision(br_a, br_b.revision_history()[4])
76
br_b2 = new_branch('br_b2')
77
assert greedy_fetch(br_b2, br_b)[0] == 7
78
assert has_revision(br_b2, br_b.revision_history()[4])
79
assert has_revision(br_b2, br_a.revision_history()[2])
80
assert not has_revision(br_b2, br_a.revision_history()[3])
82
br_a2 = new_branch('br_a2')
83
assert greedy_fetch(br_a2, br_a)[0] == 9
84
assert has_revision(br_a2, br_b.revision_history()[4])
85
assert has_revision(br_a2, br_a.revision_history()[3])
87
br_a3 = new_branch('br_a3')
88
assert greedy_fetch(br_a3, br_a2)[0] == 0
89
for revno in range(4):
90
assert not has_revision(br_a3, br_a.revision_history()[revno])
91
assert greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0] == 3
92
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
93
assert fetched == 3, "fetched %d instead of 3" % fetched
94
# InstallFailed should be raised if the branch is missing the revision
96
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
98
# InstallFailed should be raised if the branch is missing a revision
99
# from its own revision history
100
br_a2.append_revision('a-b-c')
101
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
106
if __name__ == '__main__':