← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_osutils.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
21
21
import sys
22
22
 
23
23
import bzrlib
24
 
from bzrlib.errors import BzrBadParameter
 
24
from bzrlib.errors import BzrBadParameterNotUnicode
25
25
import bzrlib.osutils as osutils
26
26
from bzrlib.tests import TestCaseInTempDir, TestCase
27
27
 
78
78
        self.assertEqual(u'foo\xae', osutils.safe_unicode('foo\xc2\xae'))
79
79
 
80
80
    def test_bad_utf8_string(self):
81
 
        self.assertRaises(BzrBadParameter, osutils.safe_unicode, '\xbb\xbb')
 
81
        self.assertRaises(BzrBadParameterNotUnicode,
 
82
                          osutils.safe_unicode,
 
83
                          '\xbb\xbb')