← 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

terminal_width can now returns None.

* bzrlib/win32utils.py:
(get_console_size): Fix typo in comment.

* bzrlib/ui/text.py:
(TextProgressView._show_line): Handle the no terminal present case.

* bzrlib/tests/test_osutils.py:
(TestTerminalWidth): Update tests.

* bzrlib/tests/blackbox/test_too_much.py:
Fix some imports.
(OldTests.test_bzr): Handle the no terminal present case.

* bzrlib/tests/__init__.py:
(VerboseTestResult.report_test_start): Handle the no terminal
present case.

* bzrlib/status.py:
(show_pending_merges): Handle the no terminal present case.
(show_pending_merges.show_log_message): Factor out some
code. Handle the no terminal present case.

* bzrlib/osutils.py:
(terminal_width): Return None if no precise value can be found.

* bzrlib/log.py:
(LineLogFormatter.__init__): Handle the no terminal present case.
(LineLogFormatter.truncate): Accept None as max_len meaning no
truncation.
(LineLogFormatter.log_string): 

* bzrlib/help.py:
(_help_commands_to_text): Handle the no terminal present case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_exceptions.py
22
22
 
23
23
from bzrlib import (
24
24
    bzrdir,
25
 
    config,
26
25
    errors,
27
 
    osutils,
28
26
    repository,
29
 
    tests,
30
27
    trace,
31
28
    )
32
29
 
48
45
        self.assertContainsRe(err, r'Bazaar has encountered an internal error')
49
46
 
50
47
 
51
 
class TestDeprecationWarning(tests.TestCaseWithTransport):
52
 
    """The deprecation warning is controlled via a global variable:
53
 
    repository._deprecation_warning_done. As such, it can be emitted only once
54
 
    during a bzr invocation, no matter how many repositories are involved.
55
 
 
56
 
    It would be better if it was a repo attribute instead but that's far more
57
 
    work than I want to do right now -- vila 20091215.
58
 
    """
59
 
 
60
 
    def setUp(self):
61
 
        super(TestDeprecationWarning, self).setUp()
62
 
        self.disable_deprecation_warning()
63
 
 
64
 
    def enable_deprecation_warning(self, repo=None):
65
 
        """repo is not used yet since _deprecation_warning_done is a global"""
 
48
class TestDeprecationWarning(TestCaseInTempDir):
 
49
 
 
50
    def test_repository_deprecation_warning(self):
 
51
        """Old formats give a warning"""
 
52
        # the warning's normally off for testing but we reenable it
66
53
        repository._deprecation_warning_done = False
67
 
 
68
 
    def disable_deprecation_warning(self, repo=None):
69
 
        """repo is not used yet since _deprecation_warning_done is a global"""
70
 
        repository._deprecation_warning_done = True
71
 
 
72
 
    def make_obsolete_repo(self, path):
73
 
        # We don't want the deprecation raising during the repo creation
74
 
        tree = self.make_branch_and_tree(path, format=bzrdir.BzrDirFormat5())
75
 
        return tree
76
 
 
77
 
    def check_warning(self, present):
78
 
        if present:
79
 
            check = self.assertContainsRe
80
 
        else:
81
 
            check = self.assertNotContainsRe
82
 
        check(self._get_log(keep_log_file=True), 'WARNING.*bzr upgrade')
83
 
 
84
 
    def test_repository_deprecation_warning(self):
85
 
        """Old formats give a warning"""
86
 
        self.make_obsolete_repo('foo')
87
 
        self.enable_deprecation_warning()
88
 
        out, err = self.run_bzr('status', working_dir='foo')
89
 
        self.check_warning(True)
90
 
 
91
 
    def test_repository_deprecation_warning_suppressed_global(self):
92
 
        """Old formats give a warning"""
93
 
        conf = config.GlobalConfig()
94
 
        conf.set_user_option('suppress_warnings', 'format_deprecation')
95
 
        self.make_obsolete_repo('foo')
96
 
        self.enable_deprecation_warning()
97
 
        out, err = self.run_bzr('status', working_dir='foo')
98
 
        self.check_warning(False)
99
 
 
100
 
    def test_repository_deprecation_warning_suppressed_locations(self):
101
 
        """Old formats give a warning"""
102
 
        self.make_obsolete_repo('foo')
103
 
        conf = config.LocationConfig(osutils.pathjoin(self.test_dir, 'foo'))
104
 
        conf.set_user_option('suppress_warnings', 'format_deprecation')
105
 
        self.enable_deprecation_warning()
106
 
        out, err = self.run_bzr('status', working_dir='foo')
107
 
        self.check_warning(False)
108
 
 
109
 
    def test_repository_deprecation_warning_suppressed_branch(self):
110
 
        """Old formats give a warning"""
111
 
        tree = self.make_obsolete_repo('foo')
112
 
        conf = tree.branch.get_config()
113
 
        conf.set_user_option('suppress_warnings', 'format_deprecation')
114
 
        self.enable_deprecation_warning()
115
 
        out, err = self.run_bzr('status', working_dir='foo')
116
 
        self.check_warning(False)
 
54
        try:
 
55
            os.mkdir('foo')
 
56
            bzrdir.BzrDirFormat5().initialize('foo')
 
57
            out, err = self.run_bzr("status foo")
 
58
            self.assertContainsRe(self._get_log(keep_log_file=True),
 
59
                                  "bzr upgrade")
 
60
        finally:
 
61
            repository._deprecation_warning_done = True
 
62