/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-16 16:23:54 UTC
  • mto: This revision was merged to the branch mainline in revision 5987.
  • Revision ID: jelmer@samba.org-20110616162354-ajihiqpb9d05rl0g
Rename import.

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,
 
35
    graph as _mod_graph,
36
36
    inventory,
37
37
    inventory_delta,
38
38
    remote,
3245
3245
        source = stacked.repository._get_source(target_repository_format)
3246
3246
        tip = stacked.last_revision()
3247
3247
        revs = stacked.repository.get_ancestry(tip)
3248
 
        search = graph.PendingAncestryResult([tip], stacked.repository)
 
3248
        search = _mod_graph.PendingAncestryResult([tip], stacked.repository)
3249
3249
        self.reset_smart_call_log()
3250
3250
        stream = source.get_stream(search)
3251
3251
        if None in revs:
3358
3358
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3359
3359
        self.hpss_calls = []
3360
3360
        local.repository.fetch(remote_branch.repository,
3361
 
                fetch_spec=graph.EverythingResult(remote_branch.repository))
 
3361
                fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3362
3362
        self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
3363
3363
 
3364
3364
    def override_verb(self, verb_name, verb):
3394
3394
        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3395
3395
        self.hpss_calls = []
3396
3396
        local.repository.fetch(remote_branch.repository,
3397
 
                fetch_spec=graph.EverythingResult(remote_branch.repository))
 
3397
                fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3398
3398
        # make sure the overridden verb was used
3399
3399
        self.assertLength(1, verb_log)
3400
3400
        # more than one HPSS call is needed, but because it's a VFS callback