~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-11 15:35:59 UTC
  • mfrom: (3101.1.2 bzr.ab2)
  • Revision ID: pqm@pqm.ubuntu.com-20071211153559-uxwxk3c9amp84i43
Improve uncommit test

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
import os
20
20
 
21
 
import bzrlib
22
21
from bzrlib import uncommit, workingtree
23
22
from bzrlib.bzrdir import BzrDirMetaFormat1
24
23
from bzrlib.errors import BzrError, BoundBranchOutOfDate
232
231
    def test_uncommit_nonascii(self):
233
232
        tree = self.make_branch_and_tree('tree')
234
233
        tree.commit(u'\u1234 message')
235
 
        real_encoding = bzrlib.user_encoding
236
 
        bzrlib.user_encoding = 'ascii'
237
 
        try:
238
 
            out, err = self.run_bzr('uncommit --force tree')
239
 
        finally:
240
 
            bzrlib.user_encoding = real_encoding
 
234
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
241
235
        self.assertContainsRe(out, r'\? message')