← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: v.ladeuil+lp at free
  • Date: 2007-05-18 18:20:31 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070518182031-gbg2cgidv5l20x9p
Takes Robert comments into account.

* bzrlib/transport/ftp.py:
(FtpTransport.__init__): Write a better explanation.

* bzrlib/tests/test_init.py:
(InstrumentedTransport): Just make hooks a class attribute.
(InstrumentedTransport._get_FTP): Run hook directly in the for
loop.
(TransportHooks.run_hook, TransportHooks.uninstall_hook): Not
needed. The hooks should be cleaned up by the test itself.
(TestInit.setUp.cleanup): Resset to default hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_debug.py
22
22
import sys
23
23
import time
24
24
 
25
 
from bzrlib.tests import TestCaseInTempDir, TestSkipped
 
25
from bzrlib.tests import TestCase, TestSkipped
26
26
 
27
 
class TestDebugOption(TestCaseInTempDir):
 
27
class TestDebugOption(TestCase):
28
28
 
29
29
    def test_dash_derror(self):
30
30
        """With -Derror, tracebacks are shown even for user errors"""
31
 
        out, err = self.run_bzr("-Derror branch nonexistent-location",
32
 
                                retcode=3)
 
31
        out, err = self.run_bzr("-Derror", "branch", "nonexistent-location",
 
32
                retcode=3)
33
33
        # error output should contain a traceback; we used to look for code in
34
34
        # here but it may be missing if the source is not in sync with the
35
35
        # pyc file.
36
36
        self.assertContainsRe(err, "Traceback \\(most recent call last\\)")
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")
41
 
        trace_messages = self._get_log(keep_log_file=True)
42
 
        self.assertContainsRe(trace_messages, "lock_write")