/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 breezy/tests/blackbox/test_pull.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_pull.py
274
274
                         branch_b.get_parent())
275
275
 
276
276
    def test_pull_bundle(self):
277
 
        from breezy.testament import Testament
 
277
        from breezy.bzr.testament import Testament
278
278
        # Build up 2 trees and prepare for a pull
279
279
        tree_a = self.make_branch_and_tree('branch_a')
280
280
        with open('branch_a/a', 'wb') as f:
353
353
        class FooService(object):
354
354
            """A directory service that always returns source"""
355
355
 
356
 
            def look_up(self, name, url):
 
356
            def look_up(self, name, url, purpose=None):
357
357
                return 'source'
358
358
        directories.register('foo:', FooService, 'Testing directory service')
359
359
        self.addCleanup(directories.remove, 'foo:')