~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
    def test_dash_dlock(self):
39
39
        # With -Dlock, locking and unlocking is recorded into the log
40
40
        self.run_bzr("-Dlock init foo")
41
 
        trace_messages = self._get_log(keep_log_file=True)
42
 
        self.assertContainsRe(trace_messages, "lock_write")
 
41
        self.assertContainsRe(self.get_log(), "lock_write")