~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_msgeditor.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
301
301
    def test__create_temp_file_with_commit_template_in_unicode_dir(self):
302
302
        self.requireFeature(tests.UnicodeFilenameFeature)
303
303
        if hasattr(self, 'info'):
304
 
            os.mkdir(self.info['directory'])
305
 
            os.chdir(self.info['directory'])
306
 
            msgeditor._create_temp_file_with_commit_template('infotext')
 
304
            tmpdir = self.info['directory']
 
305
            os.mkdir(tmpdir)
 
306
            # Force the creation of temp file in a directory whose name
 
307
            # requires some encoding support
 
308
            msgeditor._create_temp_file_with_commit_template('infotext',
 
309
                                                             tmpdir=tmpdir)
307
310
        else:
308
311
            raise TestNotApplicable('Test run elsewhere with non-ascii data.')
309
312