/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 bzrlib/tests/blackbox/test_init.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_init.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
22
22
 
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
25
 
    osutils,
26
25
    urlutils,
27
26
    )
28
27
from bzrlib.bzrdir import BzrDirMetaFormat1
75
74
Using shared repository: %s
76
75
""" % (self._default_label, urlutils.local_path_from_url(
77
76
            repo.bzrdir.root_transport.external_url())), out)
78
 
        cwd = osutils.getcwd()
79
 
        self.assertEndsWith(out, cwd + '/repo/\n')
 
77
        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
 
78
            "test_init_at_repository_root/work/repo/\n")
80
79
        self.assertEqual('', err)
81
80
        newdir.open_branch()
82
81
        newdir.open_workingtree()
196
195
    def test_init_append_revisions_only(self):
197
196
        self.run_bzr('init --dirstate-tags normal_branch6')
198
197
        branch = _mod_branch.Branch.open('normal_branch6')
199
 
        self.assertEqual(None, branch._get_append_revisions_only())
 
198
        self.assertEqual(False, branch._get_append_revisions_only())
200
199
        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
201
200
        branch = _mod_branch.Branch.open('branch6')
202
201
        self.assertEqual(True, branch._get_append_revisions_only())