Small improvements to coverage

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index 7ccc8336a605bdfb0a52c9eb95b2e170314cf025..d6d3513ec7527b4c0300c57f1334047905bd74e4 100644 (file)
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -69,7 +69,7 @@ class Consumer(LoggingMixin):
         status,
         message=None,
         document_id=None,
-    ):
+    ):  # pragma: no cover
         payload = {
             "filename": os.path.basename(self.filename) if self.filename else None,
             "task_id": self.task_id,
@@ -352,7 +352,7 @@ class Consumer(LoggingMixin):
 
         self.run_pre_consume_script()
 
-        def progress_callback(current_progress, max_progress):
+        def progress_callback(current_progress, max_progress):  # pragma: no cover
             # recalculate progress to be within 20 and 80
             p = int((current_progress / max_progress) * 50 + 20)
             self._send_progress(p, 100, "WORKING")

diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.py
index 8386712560db6ba0066d52041024d8e24f0c2ebd..eda97554d690b6a6ace0461293369207f1e37bdb 100644 (file)
--- a/src/documents/tests/test_barcodes.py
+++ b/src/documents/tests/test_barcodes.py
@@ -12,6 +12,7 @@ from documents.barcodes import BarcodeReader
 from documents.consumer import ConsumerError
 from documents.data_models import ConsumableDocument
 from documents.data_models import DocumentSource
+from documents.models import Document
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
 
@@ -764,7 +765,7 @@ class TestAsnBarcode(DirectoriesMixin, TestCase):
             self.assertEqual(reader.pdf_file, test_file)
             self.assertEqual(asn, 123)
 
-    def test_scan_file_for_asn_not_existing(self):
+    def test_scan_file_for_asn_not_found(self):
         """
         GIVEN:
             - PDF without an ASN barcode
@@ -781,6 +782,49 @@ class TestAsnBarcode(DirectoriesMixin, TestCase):
             self.assertEqual(reader.pdf_file, test_file)
             self.assertEqual(asn, None)
 
+    @override_settings(CONSUMER_ENABLE_ASN_BARCODE=True)
+    def test_scan_file_for_asn_already_exists(self):
+        """
+        GIVEN:
+            - PDF with an ASN barcode
+            - ASN value already exists
+        WHEN:
+            - File is scanned for barcodes
+        THEN:
+            - ASN is retrieved from the document
+            - Consumption fails
+        """
+
+        Document.objects.create(
+            title="WOW",
+            content="the content",
+            archive_serial_number=123,
+            checksum="456",
+            mime_type="application/pdf",
+        )
+
+        test_file = self.BARCODE_SAMPLE_DIR / "barcode-39-asn-123.pdf"
+
+        dst = settings.SCRATCH_DIR / "barcode-39-asn-123.pdf"
+        shutil.copy(test_file, dst)
+
+        with mock.patch("documents.consumer.Consumer._send_progress"):
+            with self.assertRaises(ConsumerError) as cm, self.assertLogs(
+                "paperless.consumer",
+                level="ERROR",
+            ) as logs_cm:
+                tasks.consume_file(
+                    ConsumableDocument(
+                        source=DocumentSource.ConsumeFolder,
+                        original_file=dst,
+                    ),
+                    None,
+                )
+            self.assertIn("Not consuming barcode-39-asn-123.pdf", str(cm.exception))
+            error_str = logs_cm.output[0]
+            expected_str = "ERROR:paperless.consumer:Not consuming barcode-39-asn-123.pdf: Given ASN already exists!"
+            self.assertEqual(expected_str, error_str)
+
     def test_scan_file_for_asn_barcode_invalid(self):
         """
         GIVEN: