← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_msgeditor.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105103758-wzftnmsip5iv9n2g
Revert addition of get_message_encoding function

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_msgeditor.py
34
34
    edit_commit_message_encoded
35
35
)
36
36
from bzrlib.tests import (
 
37
    features,
37
38
    TestCaseInTempDir,
38
39
    TestCaseWithTransport,
39
40
    TestNotApplicable,
251
252
        self.overrideEnv('VISUAL', 'visual')
252
253
        self.overrideEnv('EDITOR', 'editor')
253
254
 
254
 
        conf = config.GlobalConfig.from_string('editor = config_editor\n',
255
 
                                               save=True)
256
 
 
 
255
        conf = config.GlobalStack()
 
256
        conf.store._load_from_string('[DEFAULT]\neditor = config_editor\n')
 
257
        conf.store.save()
257
258
        editors = list(msgeditor._get_editor())
258
259
        editors = [editor for (editor, cfg_src) in editors]
259
260
 
309
310
        self.assertFileEqual(expected, msgfilename)
310
311
 
311
312
    def test__create_temp_file_with_commit_template_in_unicode_dir(self):
312
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
313
        self.requireFeature(features.UnicodeFilenameFeature)
313
314
        if hasattr(self, 'info'):
314
315
            tmpdir = self.info['directory']
315
316
            os.mkdir(tmpdir)