← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
129
129
        # by ui.text.show_warning
130
130
        default_get_terminal_enc = osutils.get_terminal_encoding
131
131
        try:
132
 
            osutils.get_terminal_encoding = lambda: 'ascii'
 
132
            osutils.get_terminal_encoding = lambda trace=None: 'ascii'
133
133
            file_name = u'foo\u1234'
134
134
            open(file_name, 'w').write('hello world')
135
135
            self.run_bzr(['add'])