Zim

Merge lp:~hsoft/zim/fix-test into lp:~jaap.karssenberg/zim/pyzim

  1. fix-test
  2. Merge into pyzim
Proposed by Virgil Dupras
Status: Merged
Merged at revision: 676
Proposed branch: lp:~hsoft/zim/fix-test
Merge into: lp:~jaap.karssenberg/zim/pyzim
Diff against target: 19 lines (+8/-1)
1 file modified
zim/plugins/diagrameditor.py (+8/-1)
To merge this branch: bzr merge lp:~hsoft/zim/fix-test
Reviewer Review Type Date Requested Status
Jaap Karssenberg Approve
Review via email: mp+180738@code.launchpad.net

Description of the change

Fix broken test

To post a comment you must log in.
Revision history for this message
Jaap Karssenberg (jaap.karssenberg) wrote :

Merged in pyzim-refactor

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'zim/plugins/diagrameditor.py'
--- zim/plugins/diagrameditor.py 2013-04-10 19:14:33 +0000
+++ zim/plugins/diagrameditor.py 2013-08-18 19:03:52 +0000
@@ -111,7 +111,14 @@
111 except ApplicationError:111 except ApplicationError:
112 return None, None # Sorry, no log112 return None, None # Sorry, no log
113 else:113 else:
114 return self.pngfile, None114 if self.pngfile.exists():
115 return self.pngfile, None
116 else:
117 # When supplying a dot file with a syntax error, the dot command
118 # doesn't return an error code (so we don't raise
119 # ApplicationError), but we still don't have a png file to
120 # return, so return None.
121 return None, None
115122
116 def cleanup(self):123 def cleanup(self):
117 self.dotfile.remove()124 self.dotfile.remove()