~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

Fix #87179 by using the short status format when the short format is used for log.

* bzrlib/tests/blackbox/test_log.py:
(TestLog.test_log_short_verbose): Test that we use the right
status format.

* bzrlib/log.py:
(ShortLogFormatter.log_revision): Set short_status to True.

Show diffs side-by-side

added added

removed removed

Lines of Context:
219
219
        self.assertContainsRe(log, r'revno: 2\n')
220
220
        self.assertContainsRe(log, r'revno: 3\n')
221
221
 
 
222
    def test_log_short_verbose(self):
 
223
        self._prepare()
 
224
        log = self.run_bzr("log --short -v -r 1")[0]
 
225
        # Check that we use the short status format and not the regular one
 
226
        self.assertContainsRe(log, '(?m)^A  hello.txt$')
 
227
        self.assertNotContainsRe(log, '(?m)^added:$')
 
228
 
222
229
 
223
230
class TestLogMerges(TestCaseWithoutPropsHandler):
224
231