Rev 3796: (mbp) test _get_log method should cope if .bzr.log is not open in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3796
revision-id: pqm at pqm.ubuntu.com-20081027081627-755w44j7khdrwpq0
parent: pqm at pqm.ubuntu.com-20081027073519-qy22jw3pt00k4u2w
parent: mbp at sourcefrog.net-20081017005041-bnvi3b3a78chsm81
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-10-27 08:16:27 +0000
message:
  (mbp) test _get_log method should cope if .bzr.log is not open
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3778.4.1
    revision-id: mbp at sourcefrog.net-20081017005041-bnvi3b3a78chsm81
    parent: pqm at pqm.ubuntu.com-20081015214444-ztwoizx180edy73v
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2008-10-17 11:50:41 +1100
    message:
      test _get_log method should cope if .bzr.log is not open
    modified:
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2008-10-02 13:25:47 +0000
+++ b/bzrlib/tests/__init__.py	2008-10-17 00:50:41 +0000
@@ -1354,7 +1354,8 @@
         """
         # flush the log file, to get all content
         import bzrlib.trace
-        bzrlib.trace._trace_file.flush()
+        if bzrlib.trace._trace_file:
+            bzrlib.trace._trace_file.flush()
         if self._log_contents:
             # XXX: this can hardly contain the content flushed above --vila
             # 20080128