Fix tests again.

abilian · Aug 1, 2017 · f4ebb20 · f4ebb20
1 parent 9266a3d
commit f4ebb20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/abilian/services/conversion/handlers.py b/abilian/services/conversion/handlers.py
@@ -8,7 +8,6 @@
 import os
 import re
 import subprocess
-import sys
 import threading
 import traceback
 from abc import ABCMeta, abstractmethod
@@ -414,7 +413,7 @@ def run_soffice():
                     self._process.communicate()
                 except Exception as e:
                     logger.error('soffice error: %s', bytes(e), exc_info=True)
-                    raise_from(ConversionError('unoconv failed'), e)
+                    raise_from(ConversionError('soffice conversion failed'), e)
 
             run_thread = threading.Thread(target=run_soffice)
             run_thread.start()

diff --git a/abilian/services/conversion/tests.py b/abilian/services/conversion/tests.py
@@ -42,11 +42,13 @@ def test_pdf_to_text(converter):
     text = converter.to_text("", blob, "application/pdf")
 
 
+@pytest.mark.skipif(not HAS_LIBREOFFICE, reason="requires libreoffice")
 def test_word_to_text(converter):
     blob = read_file("test.doc")
     text = converter.to_text("", blob, "application/msword")
 
 
+@pytest.mark.skipif(not HAS_LIBREOFFICE, reason="requires libreoffice")
 def test_wordx_to_text(converter):
     blob = read_file("test.docx")
     text = converter.to_text("", blob, "application/msword")