← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Andrew Bennetts
  • Date: 2011-05-18 15:45:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5895.
  • Revision ID: andrew.bennetts@canonical.com-20110518154507-t3qudgcb7fj3omjc
Use pydoctor in api-docs make target.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
32
32
    config,
33
33
    controldir,
34
34
    errors,
35
 
    graph as _mod_graph,
 
35
    graph,
36
36
    inventory,
37
37
    inventory_delta,
38
38
    remote,
3244
3244
        _, stacked = branch_factory()
3245
3245
        source = stacked.repository._get_source(target_repository_format)
3246
3246
        tip = stacked.last_revision()
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()
3252
 
        search = _mod_graph.PendingAncestryResult([tip], stacked.repository)
 
3247
        revs = stacked.repository.get_ancestry(tip)
 
3248
        search = graph.PendingAncestryResult([tip], stacked.repository)
3253
3249
        self.reset_smart_call_log()
3254
3250
        stream = source.get_stream(search)
 
3251
        if None in revs:
 
3252
            revs.remove(None)
3255
3253
        # We trust that if a revision is in the stream the rest of the new
3256
3254
        # content for it is too, as per our main fetch tests; here we are
3257
3255
        # checking that the revisions are actually included at all, and their
3296
3294
        self.assertEqual(expected_revs, rev_ord)
3297
3295
        # Getting topological sort requires VFS calls still - one of which is
3298
3296
        # pushing up from the bound branch.
3299
 
        self.assertLength(14, self.hpss_calls)
 
3297
        self.assertLength(13, self.hpss_calls)
3300
3298
 
3301
3299
    def test_stacked_get_stream_groupcompress(self):
3302
3300
        # Repository._get_source.get_stream() from a stacked repository with
3360
3358
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3361
3359
        self.hpss_calls = []
3362
3360
        local.repository.fetch(remote_branch.repository,
3363
 
                fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
 
3361
                fetch_spec=graph.EverythingResult(remote_branch.repository))
3364
3362
        self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
3365
3363
 
3366
3364
    def override_verb(self, verb_name, verb):
3396
3394
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3397
3395
        self.hpss_calls = []
3398
3396
        local.repository.fetch(remote_branch.repository,
3399
 
                fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
 
3397
                fetch_spec=graph.EverythingResult(remote_branch.repository))
3400
3398
        # make sure the overridden verb was used
3401
3399
        self.assertLength(1, verb_log)
3402
3400
        # more than one HPSS call is needed, but because it's a VFS callback