← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testfetch.py

  • Committer: Robert Collins
  • Date: 2005-10-03 01:15:02 UTC
  • mfrom: (1092.2.28)
  • Revision ID: robertc@robertcollins.net-20051003011502-f579a509a136b774
merge from baz2bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testfetch.py
54
54
    assert not has_revision(br_a, br_b.revision_history()[6])
55
55
    assert has_revision(br_a, br_b.revision_history()[5])
56
56
 
57
 
    # When a non-branch ancestor is missing, it should be a failure, not
58
 
    # exception
59
 
    print ("CANNOT TEST MISSING NON REVISION_HISTORY ANCESTORS WITHOUT"
60
 
           " GHOSTS")
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]))) 
 
57
    # When a non-branch ancestor is missing, it should be unlisted...
 
58
    # as its not present in the ancestry weave.
 
59
    br_b4 = new_branch('br_4')
 
60
    count, failures = greedy_fetch(br_b4, br_b)
 
61
    self.assertEqual(count, 7)
 
62
    self.assertEqual(failures, [])
66
63
 
67
64
    self.assertEqual(greedy_fetch(writable_a, br_b)[0], 1)
68
65
    assert has_revision(br_a, br_b.revision_history()[3])