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

[Virgil Dupras]

Fix broken test

[Jaap Karssenberg (jaap.karssenberg)]

Merged in pyzim-refactor

review: Approve

=== 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 @@
 		except ApplicationError:
 			return None, None # Sorry, no log
 		else:
-			return self.pngfile, None
+			if self.pngfile.exists():
+				return self.pngfile, None
+			else:
+				# When supplying a dot file with a syntax error, the dot command
+				# doesn't return an error code (so we don't raise
+				# ApplicationError), but we still don't have a png file to
+				# return, so return None.
+				return None, None
 
 	def cleanup(self):
 		self.dotfile.remove()