/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_non_ascii.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_non_ascii.py
225
225
        self.assertPathExists(fname2)
226
226
 
227
227
        # After 'mv' we need to re-open the working tree
228
 
        self.wt = self.wt.bzrdir.open_workingtree()
 
228
        self.wt = self.wt.controldir.open_workingtree()
229
229
        self.wt.commit('renamed to non-ascii')
230
230
 
231
231
        os.mkdir(dirname)
255
255
        dirname2 = self.info['directory'] + '2'
256
256
        url1 = urlutils.local_path_to_url(dirname1)
257
257
        url2 = urlutils.local_path_to_url(dirname2)
258
 
        out_bzrdir = self.wt.bzrdir.sprout(url1)
 
258
        out_bzrdir = self.wt.controldir.sprout(url1)
259
259
        out_bzrdir.sprout(url2)
260
260
 
261
261
        self.build_tree_contents(
417
417
        url = urlutils.local_path_to_url(dirname)
418
418
        self.run_bzr_decode('root')
419
419
 
420
 
        self.wt.bzrdir.sprout(url)
 
420
        self.wt.controldir.sprout(url)
421
421
 
422
422
        txt = self.run_bzr_decode('root', working_dir=dirname)
423
423
        self.assertTrue(txt.endswith(dirname+'\n'))