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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 10:19:02 UTC
  • mfrom: (6973.7.13 python3-g-real)
  • Revision ID: breezy.the.bot@gmail.com-20180630101902-thpqkbi44kqom06g
Fix more tests.

Merged from https://code.launchpad.net/~jelmer/brz/python3-g/+merge/348134

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
139
139
        self.requireFeature(features.UnicodeFilenameFeature)
140
140
        file_name = u'\N{euro sign}'
141
141
        self.run_bzr(['init'])
142
 
        with open(file_name, 'w') as f: f.write('hello world')
 
142
        with open(file_name, 'w') as f:
 
143
            f.write('hello world')
143
144
        self.run_bzr(['add'])
144
145
        out, err = self.run_bzr(['commit', '-m', file_name])
145
146
        reflags = re.MULTILINE|re.DOTALL|re.UNICODE
157
158
        try:
158
159
            osutils.get_terminal_encoding = lambda trace=None: 'ascii'
159
160
            file_name = u'foo\u1234'
160
 
            with open(file_name, 'w') as f: f.write('hello world')
 
161
            with open(file_name, 'w') as f:
 
162
                f.write('hello world')
161
163
            self.run_bzr(['add'])
162
164
            out, err = self.run_bzr(['commit', '-m', file_name])
163
165
            reflags = re.MULTILINE|re.DOTALL|re.UNICODE
781
783
    def setup_editor(self):
782
784
        # Test that commit template hooks work
783
785
        if sys.platform == "win32":
784
 
            f = file('fed.bat', 'w')
785
 
            f.write('@rem dummy fed')
786
 
            f.close()
 
786
            with open('fed.bat', 'w') as f:
 
787
                f.write('@rem dummy fed')
787
788
            self.overrideEnv('BRZ_EDITOR', "fed.bat")
788
789
        else:
789
 
            f = file('fed.sh', 'wb')
790
 
            f.write('#!/bin/sh\n')
791
 
            f.close()
 
790
            with open('fed.sh', 'wb') as f:
 
791
                f.write(b'#!/bin/sh\n')
792
792
            os.chmod('fed.sh', 0o755)
793
793
            self.overrideEnv('BRZ_EDITOR', "./fed.sh")
794
794