← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-10-01 07:56:03 UTC
  • mfrom: (3224.5.40 faster-startup)
  • Revision ID: pqm@pqm.ubuntu.com-20081001075603-s9nynw8y85fmrprj
Reduce startup time by a small amount. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
32
32
    bzrdir,
33
33
    conflicts,
34
34
    errors,
 
35
    osutils,
35
36
    )
36
37
import bzrlib.branch
37
38
from bzrlib.osutils import pathjoin
478
479
    
479
480
    def setUp(self):
480
481
        TestCaseWithTransport.setUp(self)
481
 
        self.user_encoding = bzrlib.user_encoding
 
482
        self.user_encoding = osutils._cached_user_encoding
482
483
        self.stdout = sys.stdout
483
484
 
484
485
    def tearDown(self):
500
501
 
501
502
    def test_stdout_ascii(self):
502
503
        sys.stdout = StringIO()
503
 
        bzrlib.user_encoding = 'ascii'
 
504
        osutils._cached_user_encoding = 'ascii'
504
505
        working_tree = self.make_uncommitted_tree()
505
506
        stdout, stderr = self.run_bzr("status")
506
507
 
511
512
 
512
513
    def test_stdout_latin1(self):
513
514
        sys.stdout = StringIO()
514
 
        bzrlib.user_encoding = 'latin-1'
 
515
        osutils._cached_user_encoding = 'latin-1'
515
516
        working_tree = self.make_uncommitted_tree()
516
517
        stdout, stderr = self.run_bzr('status')
517
518