← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.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/test_revisiontree.py
1
 
# Copyright (C) 2006, 2008-2011 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
18
18
"""Tests for the RevisionTree class."""
19
19
 
20
20
from bzrlib import (
21
 
    errors,
22
21
    revision,
23
22
    )
 
23
import bzrlib
24
24
from bzrlib.tests import TestCaseWithTransport
25
25
 
26
26
 
59
59
        null_tree = self.t.branch.repository.revision_tree(
60
60
            revision.NULL_REVISION)
61
61
        self.assertIs(None, null_tree.inventory.root)
62
 
        self.assertIs(None, null_tree.get_root_id())
63
 
 
64
 
    def test_get_file_revision_root(self):
65
 
        self.assertEquals(self.rev_id,
66
 
            self.rev_tree.get_file_revision(self.rev_tree.get_root_id()))
67
 
 
68
 
    def test_get_file_revision(self):
69
 
        self.build_tree_contents([('a', 'initial')])
70
 
        self.t.add(['a'])
71
 
        revid1 = self.t.commit('add a')
72
 
        revid2 = self.t.commit('another change', allow_pointless=True)
73
 
        tree = self.t.branch.repository.revision_tree(revid2)
74
 
        self.assertEquals(revid1,
75
 
            tree.get_file_revision(tree.path2id('a')))
76
 
 
77
 
    def test_get_file_mtime_ghost(self):
78
 
        file_id = iter(self.rev_tree.all_file_ids()).next()
79
 
        self.rev_tree.inventory[file_id].revision = 'ghostrev'
80
 
        self.assertRaises(errors.FileTimestampUnavailable, 
81
 
            self.rev_tree.get_file_mtime, file_id)