/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-19 17:49:43 UTC
  • mto: This revision was merged to the branch mainline in revision 5987.
  • Revision ID: jelmer@samba.org-20110619174943-v1adia1sb3tc8fvw
Fix another use of get_ancestry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
3244
3244
        _, stacked = branch_factory()
3245
3245
        source = stacked.repository._get_source(target_repository_format)
3246
3246
        tip = stacked.last_revision()
3247
 
        revs = stacked.repository.get_ancestry(tip)
 
3247
        stacked.repository._ensure_real()
 
3248
        graph = stacked.repository.get_graph()
 
3249
        revs = [r for (r,ps) in graph.iter_ancestry([tip])
 
3250
                if r != NULL_REVISION]
 
3251
        revs.reverse()
3248
3252
        search = _mod_graph.PendingAncestryResult([tip], stacked.repository)
3249
3253
        self.reset_smart_call_log()
3250
3254
        stream = source.get_stream(search)
3251
 
        if None in revs:
3252
 
            revs.remove(None)
3253
3255
        # We trust that if a revision is in the stream the rest of the new
3254
3256
        # content for it is too, as per our main fetch tests; here we are
3255
3257
        # checking that the revisions are actually included at all, and their
3294
3296
        self.assertEqual(expected_revs, rev_ord)
3295
3297
        # Getting topological sort requires VFS calls still - one of which is
3296
3298
        # pushing up from the bound branch.
3297
 
        self.assertLength(13, self.hpss_calls)
 
3299
        self.assertLength(14, self.hpss_calls)
3298
3300
 
3299
3301
    def test_stacked_get_stream_groupcompress(self):
3300
3302
        # Repository._get_source.get_stream() from a stacked repository with