/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Merge test-run support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_exceptions.py
28
28
    repository,
29
29
    tests,
30
30
    )
31
 
from breezy.sixish import PY3
32
31
from breezy.bzr.groupcompress_repo import RepositoryFormat2a
33
32
 
34
33
 
38
37
        # we must use a subprocess, because the normal in-memory mechanism
39
38
        # allows errors to propagate up through the test suite
40
39
        out, err = self.run_bzr_subprocess(['assert-fail'],
41
 
                                           universal_newlines=True,
42
 
                                           retcode=errors.EXIT_INTERNAL_ERROR)
 
40
            universal_newlines=True,
 
41
            retcode=errors.EXIT_INTERNAL_ERROR)
43
42
        self.assertEqual(4, errors.EXIT_INTERNAL_ERROR)
44
 
        self.assertContainsRe(err, br'\nAssertionError: always fails\n')
45
 
        self.assertContainsRe(
46
 
            err, br'Bazaar has encountered an internal error')
 
43
        self.assertContainsRe(err, r'\nAssertionError: always fails\n')
 
44
        self.assertContainsRe(err, r'Bazaar has encountered an internal error')
47
45
 
48
46
    def test_undecodable_argv(self):
49
47
        """A user error must be reported if argv is not in the locale encoding
53
51
        """
54
52
        if os.name != "posix":
55
53
            raise tests.TestNotApplicable("Needs system beholden to C locales")
56
 
        if PY3:
57
 
            raise tests.TestNotApplicable(
58
 
                "Unable to pass argv to subprocess as bytes")
59
 
        out, err = self.run_bzr_subprocess([b"\xa0"],
60
 
                                           env_changes={
61
 
                                               "LANG": "C", "LC_ALL": "C"},
62
 
                                           universal_newlines=True,
63
 
                                           retcode=errors.EXIT_ERROR)
64
 
        self.assertContainsRe(err, br"^brz: ERROR: .*'\\xa0'.* unsupported",
65
 
                              flags=re.MULTILINE)
66
 
        self.assertEqual(out, b"")
 
54
        out, err = self.run_bzr_subprocess(["\xa0"],
 
55
            env_changes={"LANG": "C", "LC_ALL": "C"},
 
56
            universal_newlines=True,
 
57
            retcode=errors.EXIT_ERROR)
 
58
        self.assertContainsRe(err, r"^brz: ERROR: .*'\\xa0'.* unsupported",
 
59
            flags=re.MULTILINE)
 
60
        self.assertEqual(out, "")
67
61
 
68
62
    def test_utf8_default_fs_enc(self):
69
63
        """In the C locale brz treats a posix filesystem as UTF-8 encoded"""
70
64
        if os.name != "posix":
71
65
            raise tests.TestNotApplicable("Needs system beholden to C locales")
72
66
        out, err = self.run_bzr_subprocess(["init", "file:%C2%A7"],
73
 
                                           env_changes={"LANG": "C", "LC_ALL": "C"})
74
 
        self.assertContainsRe(out, b"^Created a standalone tree .*$")
 
67
            env_changes={"LANG": "C", "LC_ALL": "C"})
 
68
        self.assertContainsRe(out, "^Created a standalone tree .*$")
75
69
 
76
70
 
77
71
class TestOptParseBugHandling(tests.TestCase):
78
72
    "Test that we handle http://bugs.python.org/issue2931"
79
73
 
80
74
    def test_nonascii_optparse(self):
81
 
        """Reasonable error raised when non-ascii in option name on Python 2"""
82
 
        if PY3:
83
 
            error_re = u'no such option: -\xe4'
84
 
        else:
85
 
            error_re = 'Only ASCII permitted in option names'
 
75
        """Reasonable error raised when non-ascii in option name"""
 
76
        error_re = 'Only ASCII permitted in option names'
86
77
        out = self.run_bzr_error([error_re], ['st', u'-\xe4'])
87
78
 
88
79
 
108
99
    def setUp(self):
109
100
        super(TestDeprecationWarning, self).setUp()
110
101
        self.addCleanup(repository.format_registry.remove,
111
 
                        TestObsoleteRepoFormat)
 
102
            TestObsoleteRepoFormat)
112
103
        repository.format_registry.register(TestObsoleteRepoFormat)
113
104
        self.addCleanup(controldir.format_registry.remove, "testobsolete")
114
105
        bzr.register_metadir(controldir.format_registry, "testobsolete",
115
 
                             "breezy.tests.blackbox.test_exceptions.TestObsoleteRepoFormat",
116
 
                             branch_format='breezy.bzr.branch.BzrBranchFormat7',
117
 
                             tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
118
 
                             deprecated=True,
119
 
                             help='Same as 2a, but with an obsolete repo format.')
 
106
            "breezy.tests.blackbox.test_exceptions.TestObsoleteRepoFormat",
 
107
            branch_format='breezy.bzr.branch.BzrBranchFormat7',
 
108
            tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
 
109
            deprecated=True,
 
110
            help='Same as 2a, but with an obsolete repo format.')
120
111
        self.disable_deprecation_warning()
121
112
 
122
113
    def enable_deprecation_warning(self, repo=None):