← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_checkout.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_checkout.py
160
160
            '--hardlink'])
161
161
        source_stat = os.stat('source/file1')
162
162
        target_stat = os.stat('target/file1')
163
 
        self.assertEqual(source_stat, target_stat)
 
163
        same_file = (source_stat == target_stat)
 
164
        if same_file:
 
165
            pass
 
166
        else:
 
167
            # https://bugs.edge.launchpad.net/bzr/+bug/408193
 
168
            self.assertContainsRe(err, "hardlinking working copy files is "
 
169
                "not currently supported")
 
170
            raise KnownFailure("--hardlink doesn't work in formats "
 
171
                "that support content filtering (#408193)")