Merge pull request JazzCore#8 from rory/master

JazzCore · JazzCore · commit aaceeb6f6b7f · 2014-03-28T20:56:22.000+03:00
If you provide a bad wkhtmltopdf option, you should get an exception
diff --git a/pdfkit/pdfkit.py b/pdfkit/pdfkit.py
@@ -105,9 +105,14 @@ def to_pdf(self, path=None):
             input = None
         stdout, stderr = result.communicate(input=input)
 
+        exit_code = result.returncode
+
         if 'Error' in stderr.decode('utf-8'):
             raise IOError('wkhtmltopdf reported an error:\n' + stderr.decode('utf-8'))
 
+        if exit_code != 0:
+            raise IOError("wkhtmltopdf exited with non-zero code {0}. error:\n{1}".format(exit_code, stderr.decode("utf-8")))
+
         # Since wkhtmltopdf sends its output to stderr we will capture it
         # and properly send to stdout
         if '--quiet' not in args:
diff --git a/tests/pdfkit-tests.py b/tests/pdfkit-tests.py
@@ -293,5 +293,14 @@ def test_raise_error_with_wrong_css_path(self):
         with self.assertRaises(IOError):
             r.to_pdf()
 
+    def test_raise_error_if_bad_wkhtmltopdf_option(self):
+        r = pdfkit.PDFKit('<html><body>Hai!</body></html>', 'string',
+                          options={'bad-option': None})
+        with self.assertRaises(IOError) as cm:
+            r.to_pdf()
+
+        raised_exception = cm.exception
+        self.assertRegexpMatches(str(raised_exception), '^wkhtmltopdf exited with non-zero code 1. error:\nUnknown long argument --bad-option\n')
+
 if __name__ == "__main__":
     unittest.main()
