← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_modified.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_modified.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
21
21
import os
22
22
 
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.tests import TestCaseWithTransport
 
24
from bzrlib.tests.blackbox import ExternalBase
25
25
 
26
 
class TestModified(TestCaseWithTransport):
 
26
class TestModified(ExternalBase):
27
27
 
28
28
    def test_modified(self):
29
29
        """Test that 'modified' command reports modified files"""
70
70
        tree.commit(message='modified %s' %(name))
71
71
        check_modified('')
72
72
 
73
 
    def test_modified_directory(self):
74
 
        """Test --directory option"""
75
 
        tree = self.make_branch_and_tree('a')
76
 
        self.build_tree(['a/README'])
77
 
        tree.add('README')
78
 
        tree.commit('r1')
79
 
        self.build_tree_contents([('a/README', 'changed\n')])
80
 
        out, err = self.run_bzr(['modified', '--directory=a'])
81
 
        self.assertEquals('README\n', out)