revert commit

This commit is contained in:
jonaswinkler 2021-02-07 18:26:03 +01:00
parent 731418349f
commit 9b64eebd10
3 changed files with 4 additions and 43 deletions

View File

@ -56,8 +56,7 @@ def check_sanity():
messages.append(SanityError( messages.append(SanityError(
f"Thumbnail of document {doc.pk} does not exist.")) f"Thumbnail of document {doc.pk} does not exist."))
else: else:
if os.path.normpath(doc.thumbnail_path) in present_files: present_files.remove(os.path.normpath(doc.thumbnail_path))
present_files.remove(os.path.normpath(doc.thumbnail_path))
try: try:
with doc.thumbnail_file as f: with doc.thumbnail_file as f:
f.read() f.read()
@ -72,8 +71,7 @@ def check_sanity():
messages.append(SanityError( messages.append(SanityError(
f"Original of document {doc.pk} does not exist.")) f"Original of document {doc.pk} does not exist."))
else: else:
if os.path.normpath(doc.source_path) in present_files: present_files.remove(os.path.normpath(doc.source_path))
present_files.remove(os.path.normpath(doc.source_path))
try: try:
with doc.source_file as f: with doc.source_file as f:
checksum = hashlib.md5(f.read()).hexdigest() checksum = hashlib.md5(f.read()).hexdigest()
@ -94,8 +92,7 @@ def check_sanity():
f"Archived version of document {doc.pk} does not exist." f"Archived version of document {doc.pk} does not exist."
)) ))
else: else:
if os.path.normpath(doc.archive_path) in present_files: present_files.remove(os.path.normpath(doc.archive_path))
present_files.remove(os.path.normpath(doc.archive_path))
try: try:
with doc.archive_file as f: with doc.archive_file as f:
checksum = hashlib.md5(f.read()).hexdigest() checksum = hashlib.md5(f.read()).hexdigest()
@ -106,8 +103,7 @@ def check_sanity():
else: else:
if not checksum == doc.archive_checksum: if not checksum == doc.archive_checksum:
messages.append(SanityError( messages.append(SanityError(
f"Checksum mismatch of archived document " f"Checksum mismatch of archive {doc.pk}. "
f"{doc.pk}. "
f"Stored: {doc.checksum}, actual: {checksum}." f"Stored: {doc.checksum}, actual: {checksum}."
)) ))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

View File

@ -5,14 +5,12 @@ import tempfile
from unittest import mock from unittest import mock
from unittest.mock import MagicMock from unittest.mock import MagicMock
from django.conf import settings
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from .utils import DirectoriesMixin from .utils import DirectoriesMixin
from ..consumer import Consumer, ConsumerError from ..consumer import Consumer, ConsumerError
from ..models import FileInfo, Tag, Correspondent, DocumentType, Document from ..models import FileInfo, Tag, Correspondent, DocumentType, Document
from ..parsers import DocumentParser, ParseError from ..parsers import DocumentParser, ParseError
from ..tasks import sanity_check
class TestAttributes(TestCase): class TestAttributes(TestCase):
@ -183,24 +181,6 @@ class DummyParser(DocumentParser):
self.text = "The Text" self.text = "The Text"
class CopyParser(DocumentParser):
def get_thumbnail(self, document_path, mime_type):
return self.fake_thumb
def get_optimised_thumbnail(self, document_path, mime_type):
return self.fake_thumb
def __init__(self, logging_group, progress_callback=None):
super(CopyParser, self).__init__(logging_group, progress_callback)
_, self.fake_thumb = tempfile.mkstemp(suffix=".png", dir=self.tempdir)
def parse(self, document_path, mime_type, file_name=None):
self.text = "The text"
self.archive_path = os.path.join(self.tempdir, "archive.pdf")
shutil.copy(document_path, self.archive_path)
class FaultyParser(DocumentParser): class FaultyParser(DocumentParser):
def get_thumbnail(self, document_path, mime_type): def get_thumbnail(self, document_path, mime_type):
@ -223,8 +203,6 @@ def fake_magic_from_file(file, mime=False):
if mime: if mime:
if os.path.splitext(file)[1] == ".pdf": if os.path.splitext(file)[1] == ".pdf":
return "application/pdf" return "application/pdf"
elif os.path.splitext(file)[1] == ".png":
return "image/png"
else: else:
return "unknown" return "unknown"
else: else:
@ -538,19 +516,6 @@ class TestConsumer(DirectoriesMixin, TestCase):
self._assert_first_last_send_progress(last_status="FAILED") self._assert_first_last_send_progress(last_status="FAILED")
@mock.patch("documents.parsers.document_consumer_declaration.send")
def test_similar_filenames(self, m):
shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
shutil.copy(os.path.join(os.path.dirname(__file__), "samples", "simple.png"), os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
m.return_value = [(None, {
"parser": CopyParser,
"mime_types": {"application/pdf": ".pdf", "image/png": ".zip"},
"weight": 0
})]
doc1 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.png"))
doc2 = self.consumer.try_consume_file(os.path.join(settings.CONSUMPTION_DIR, "simple.pdf"))
sanity_check()
class PreConsumeTestCase(TestCase): class PreConsumeTestCase(TestCase):