← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport_log.py

Merge up through 2.2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport_log.py
1
 
# Copyright (C) 2004, 2005, 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
 
21
21
import types
22
22
 
23
 
 
 
23
from bzrlib import transport
24
24
from bzrlib.tests import TestCaseWithMemoryTransport
25
25
from bzrlib.trace import mutter
26
 
from bzrlib.transport import get_transport
27
26
from bzrlib.transport.log import TransportLogDecorator
28
27
 
29
28
 
31
30
 
32
31
    def test_log_transport(self):
33
32
        base_transport = self.get_transport('')
34
 
        logging_transport = get_transport('log+' + base_transport.base)
 
33
        logging_transport = transport.get_transport(
 
34
            'log+' + base_transport.base)
35
35
 
36
36
        # operations such as mkdir are logged
37
37
        mutter('where are you?')
38
38
        logging_transport.mkdir('subdir')
39
 
        self.assertContainsRe(self._get_log(True),
40
 
            r'mkdir memory\+\d+://.*subdir')
41
 
        self.assertContainsRe(self._get_log(True),
42
 
            '  --> None')
 
39
        log = self.get_log()
 
40
        self.assertContainsRe(log, r'mkdir memory\+\d+://.*subdir')
 
41
        self.assertContainsRe(log, '  --> None')
43
42
        # they have the expected effect
44
43
        self.assertTrue(logging_transport.has('subdir'))
45
44
        # and they operate on the underlying transport