From 8e35e6c72612e4c93f994fac752ba16041a643bd Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:32:00 +0200 Subject: [PATCH] fix test cases --- src/documents/tests/test_merge.py | 2 +- src/documents/views.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/documents/tests/test_merge.py b/src/documents/tests/test_merge.py index 26c05d29..c794722e 100644 --- a/src/documents/tests/test_merge.py +++ b/src/documents/tests/test_merge.py @@ -26,7 +26,7 @@ class TestPdfCache(DirectoriesMixin, TestCase): def test_open_no_pdf(self): doc = Document.objects.create(mime_type="image/jpeg") - self.assertRaisesMessage(MergeError, "does not have PDF.", self.cache.open_from_document, doc) + self.assertRaisesMessage(MergeError, "does not have a PDF.", self.cache.open_from_document, doc) def test_open_original_pdf(self): doc = Document.objects.create(mime_type="application/pdf", filename="test.pdf") diff --git a/src/documents/views.py b/src/documents/views.py index c12a8f73..87d5d55e 100755 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -675,6 +675,7 @@ class DocumentSplitMergeViewSet(GenericViewSet): tempdir=self.tempdir ) except MergeError: - raise + logger.exception("Error during merge") + return HttpResponseBadRequest() return Response([os.path.basename(file) for file in pdf_files])