/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 bzrlib/tests/blackbox/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2010-07-07 11:21:19 UTC
  • mto: (5193.7.1 unify-confs)
  • mto: This revision was merged to the branch mainline in revision 5349.
  • Revision ID: v.ladeuil+lp@free.fr-20100707112119-jwyh312df41w6l0o
Revert previous change as I can't reproduce the related problem anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
33
33
    probe_bad_non_ascii,
34
34
    TestSkipped,
35
35
    )
36
 
from bzrlib.tests.blackbox import ExternalBase
37
 
 
38
 
 
39
 
class TestCommit(ExternalBase):
 
36
from bzrlib.tests import TestCaseWithTransport
 
37
 
 
38
 
 
39
class TestCommit(TestCaseWithTransport):
40
40
 
41
41
    def test_05_empty_commit(self):
42
42
        """Commit of tree with no versioned files should fail"""
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'])
698
698
        self.assertContainsRe(err, r'modified test\nCommitted revision 2.')
699
699
 
700
700
    def test_commit_readonly_checkout(self):
701
 
        # https://bugs.edge.launchpad.net/bzr/+bug/129701
 
701
        # https://bugs.launchpad.net/bzr/+bug/129701
702
702
        # "UnlockableTransport error trying to commit in checkout of readonly
703
703
        # branch"
704
704
        self.make_branch('master')