[pypy-svn] pypy default: Reapplied fix for failing tests on systems w/o graphviz.

[tav]

Author: tav <tav at espians.com>
Branch: 
Changeset: r42474:5ee2d7993eb1
Date: 2011-03-08 12:56 +0000
http://bitbucket.org/pypy/pypy/changeset/5ee2d7993eb1/

Log:	Reapplied fix for failing tests on systems w/o graphviz.

diff --git a/pypy/doc/pytest_restdoc.py b/pypy/doc/pytest_restdoc.py
--- a/pypy/doc/pytest_restdoc.py
+++ b/pypy/doc/pytest_restdoc.py
@@ -74,14 +74,19 @@
         py.test.importorskip("docutils")
         self.register_linkrole()
         from docutils.utils import SystemMessage
-        try: 
+        try:
             self._checkskip(path, self.project.get_htmloutputpath(path))
             self.project.process(path)
-        except KeyboardInterrupt: 
-            raise 
-        except SystemMessage: 
-            # we assume docutils printed info on stdout 
-            py.test.fail("docutils processing failed, see captured stderr") 
+        except KeyboardInterrupt:
+            raise
+        except SystemExit, error:
+            if error.message == "ERROR: dot not found":
+                py.test.skip("system doesn't have graphviz installed")
+                return
+            raise
+        except SystemMessage:
+            # we assume docutils printed info on stdout
+            py.test.fail("docutils processing failed, see captured stderr")
 
     def register_linkrole(self):
         #directive.register_linkrole('api', self.resolve_linkrole)