/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/per_workingtree/test_executable.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
        self.wt.commit('adding a,b', rev_id='r1')
72
72
        # Now make sure that 'bzr branch' also preserves the
73
73
        # executable bit
74
 
        dir2 = self.wt.branch.bzrdir.sprout('b2', revision_id='r1')
 
74
        dir2 = self.wt.branch.controldir.sprout('b2', revision_id='r1')
75
75
        wt2 = dir2.open_workingtree()
76
76
        self.assertEqual(['r1'], wt2.get_parent_ids())
77
77
        self.assertEqual('r1', wt2.branch.last_revision())
83
83
 
84
84
    def test_02_stays_executable(self):
85
85
        """reopen the tree and ensure it stuck."""
86
 
        self.wt = self.wt.bzrdir.open_workingtree()
 
86
        self.wt = self.wt.controldir.open_workingtree()
87
87
        self.check_exist(self.wt)
88
88
 
89
89
    def test_03_after_commit(self):