← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2011-04-28 12:26:34 UTC
  • mfrom: (5609.33.5 2.3)
  • mto: This revision was merged to the branch mainline in revision 5811.
  • Revision ID: v.ladeuil+lp@free.fr-20110428122634-rzbnq9u3aircltdo
Merge 2.3 into trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_exceptions.py
55
55
        if os.name != "posix":
56
56
            raise tests.TestNotApplicable("Needs system beholden to C locales")
57
57
        out, err = self.run_bzr_subprocess(["\xa0"],
58
 
            env_changes={"LANG": "C", "LC_ALL": "C"},
 
58
            env_changes={"LANG": "C"},
59
59
            universal_newlines=True,
60
60
            retcode=errors.EXIT_ERROR)
61
61
        self.assertContainsRe(err, r"^bzr: ERROR: .*'\\xa0'.* unsupported")
102
102
        bzrdir.register_metadir(controldir.format_registry, "testobsolete",
103
103
            "bzrlib.tests.blackbox.test_exceptions.TestObsoleteRepoFormat",
104
104
            branch_format='bzrlib.branch.BzrBranchFormat7',
105
 
            tree_format='bzrlib.workingtree_4.WorkingTreeFormat6',
 
105
            tree_format='bzrlib.workingtree.WorkingTreeFormat6',
106
106
            deprecated=True,
107
107
            help='Same as 2a, but with an obsolete repo format.')
108
108
        self.disable_deprecation_warning()