Rev 3103: Improve uncommit test in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3103
revision-id:pqm at pqm.ubuntu.com-20071211153559-uxwxk3c9amp84i43
parent: pqm at pqm.ubuntu.com-20071211072935-5kj4hhh82rgkqqwb
parent: abentley at panoramicfeedback.com-20071211143631-ti168jgy6rh9z9ky
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-12-11 15:35:59 +0000
message:
  Improve uncommit test
modified:
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
    ------------------------------------------------------------
    revno: 3101.1.2
    revision-id:abentley at panoramicfeedback.com-20071211143631-ti168jgy6rh9z9ky
    parent: aaron.bentley at utoronto.ca-20071211051336-mc7fscztxvrdxo1h
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab2
    timestamp: Tue 2007-12-11 09:36:31 -0500
    message:
      Improve uncommit test
    modified:
      bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
=== modified file 'bzrlib/tests/blackbox/test_uncommit.py'
--- a/bzrlib/tests/blackbox/test_uncommit.py	2007-12-11 05:13:36 +0000
+++ b/bzrlib/tests/blackbox/test_uncommit.py	2007-12-11 14:36:31 +0000
@@ -18,7 +18,6 @@
 
 import os
 
-import bzrlib
 from bzrlib import uncommit, workingtree
 from bzrlib.bzrdir import BzrDirMetaFormat1
 from bzrlib.errors import BzrError, BoundBranchOutOfDate
@@ -232,10 +231,5 @@
     def test_uncommit_nonascii(self):
         tree = self.make_branch_and_tree('tree')
         tree.commit(u'\u1234 message')
-        real_encoding = bzrlib.user_encoding
-        bzrlib.user_encoding = 'ascii'
-        try:
-            out, err = self.run_bzr('uncommit --force tree')
-        finally:
-            bzrlib.user_encoding = real_encoding
+        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
         self.assertContainsRe(out, r'\? message')