~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport_log.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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