~bzr-pqm/bzr/bzr.dev

5609.16.1 by John Arbash Meinel
Fix bug #713258. Restore logging of bytes transferred.
1
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
16
17
"""Blackbox tests for -D debug options"""
18
19
import os
2423.3.1 by Martin Pool
C-\ drops bzr into the debugger
20
import signal
21
import sys
22
import time
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
23
5609.16.1 by John Arbash Meinel
Fix bug #713258. Restore logging of bytes transferred.
24
from bzrlib import debug, tests
25
26
27
class TestDebugOption(tests.TestCaseInTempDir):
2095.5.1 by Martin Pool
Add new -Derror global option to always display tracebacks
28
29
    def test_dash_derror(self):
30
        """With -Derror, tracebacks are shown even for user errors"""
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
31
        out, err = self.run_bzr("-Derror branch nonexistent-location",
32
                                retcode=3)
2308.1.1 by Martin Pool
Avoid false failure of test_dash_derror
33
        # error output should contain a traceback; we used to look for code in
34
        # here but it may be missing if the source is not in sync with the
35
        # pyc file.
36
        self.assertContainsRe(err, "Traceback \\(most recent call last\\)")
2555.3.3 by Martin Pool
Simple lock tracing in LockDir
37
38
    def test_dash_dlock(self):
39
        # With -Dlock, locking and unlocking is recorded into the log
40
        self.run_bzr("-Dlock init foo")
4794.1.15 by Robert Collins
Review feedback.
41
        self.assertContainsRe(self.get_log(), "lock_write")
5609.16.1 by John Arbash Meinel
Fix bug #713258. Restore logging of bytes transferred.
42
43
44
class TestDebugBytes(tests.TestCaseWithTransport):
45
46
    def test_bytes_reports_activity(self):
47
        tree = self.make_branch_and_tree('tree')
48
        self.build_tree(['tree/one'])
49
        tree.add('one')
50
        rev_id = tree.commit('first')
51
        remote_trans = self.make_smart_server('.')
52
        # I would like to avoid run_bzr_subprocess here, but we need it to be
53
        # connected to a real TextUIFactory. The NullProgressView always
54
        # ignores transport activity.
6561.2.1 by Vincent Ladeuil
Add a ``progress_bar`` config option.
55
        out, err = self.run_bzr_subprocess(
56
            'branch -Dbytes -Oprogress_bar=text %s/tree target'
57
            % (remote_trans.base,))
5609.16.1 by John Arbash Meinel
Fix bug #713258. Restore logging of bytes transferred.
58
        self.assertContainsRe(err, 'Branched 1 revision')
59
        self.assertContainsRe(err, 'Transferred:.*kB')