/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/plugins/upload/tests/test_upload.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-07 18:37:11 UTC
  • mfrom: (6667.2.1 trunk)
  • Revision ID: breezy.the.bot@gmail.com-20170607183711-oz0x9xqqh9x8jgas
Use ControlDir rather than BzrDir, remove unused imports.

Merged from https://code.launchpad.net/~jelmer/brz/small-fixes/+merge/325196

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
119
119
    def make_branch_and_working_tree(self):
120
120
        t = transport.get_transport(self.branch_dir)
121
121
        t.ensure_base()
122
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
122
        branch = controldir.ControlDir.create_branch_convenience(
123
123
            t.base,
124
124
            format=controldir.format_registry.make_bzrdir('default'),
125
125
            force_new_tree=False)
453
453
 
454
454
    def get_upload_auto(self):
455
455
        # We need a fresh branch to check what has been saved on disk
456
 
        b = bzrdir.BzrDir.open(self.tree.basedir).open_branch()
 
456
        b = controldir.ControlDir.open(self.tree.basedir).open_branch()
457
457
        return b.get_config_stack().get('upload_auto')
458
458
 
459
459
    def test_upload_auto(self):