paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-03 03:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes up some minor warnings from test code

Browse Source
This commit is contained in:
Trenton Holmes
2023-02-05 17:42:35 -08:00
committed by Trenton H
parent 7bfb11a711
commit 3e777f2a5b
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/documents/consumer.py
View File

@@ -342,6 +342,7 @@ class Consumer(LoggingMixin):
mime_type, mime_type,
) )
if not parser_class: if not parser_class:
tempdir.cleanup()
self._fail(MESSAGE_UNSUPPORTED_TYPE, f"Unsupported mime type {mime_type}") self._fail(MESSAGE_UNSUPPORTED_TYPE, f"Unsupported mime type {mime_type}")
# Notify all listeners that we're going to do some work. # Notify all listeners that we're going to do some work.
@@ -400,6 +401,7 @@ class Consumer(LoggingMixin):
except ParseError as e: except ParseError as e:
document_parser.cleanup() document_parser.cleanup()
tempdir.cleanup()
self._fail( self._fail(
str(e), str(e),
f"Error while consuming document {self.filename}: {e}", f"Error while consuming document {self.filename}: {e}",

2
src/documents/tests/test_api.py
View File

@@ -3200,7 +3200,7 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
self.assertEqual(StoragePath.objects.count(), 1) self.assertEqual(StoragePath.objects.count(), 1)
class TestTasks(APITestCase): class TestTasks(DirectoriesMixin, APITestCase):
ENDPOINT = "/api/tasks/" ENDPOINT = "/api/tasks/"
ENDPOINT_ACKNOWLEDGE = "/api/acknowledge_tasks/" ENDPOINT_ACKNOWLEDGE = "/api/acknowledge_tasks/"

31
src/documents/tests/test_consumer.py
View File

@@ -847,13 +847,11 @@ class PreConsumeTestCase(TestCase):
self.assertEqual(command[0], script.name) self.assertEqual(command[0], script.name)
self.assertEqual(command[1], "path-to-file") self.assertEqual(command[1], "path-to-file")
self.assertDictContainsSubset( subset = {
{ "DOCUMENT_SOURCE_PATH": c.original_path,
"DOCUMENT_SOURCE_PATH": c.original_path, "DOCUMENT_WORKING_PATH": c.path,
"DOCUMENT_WORKING_PATH": c.path, }
}, self.assertDictEqual(environment, {**environment, **subset})
environment,
)
@mock.patch("documents.consumer.Consumer.log") @mock.patch("documents.consumer.Consumer.log")
def test_script_with_output(self, mocked_log): def test_script_with_output(self, mocked_log):
@@ -983,16 +981,15 @@ class PostConsumeTestCase(TestCase):
self.assertEqual(command[7], "my_bank") self.assertEqual(command[7], "my_bank")
self.assertCountEqual(command[8].split(","), ["a", "b"]) self.assertCountEqual(command[8].split(","), ["a", "b"])
self.assertDictContainsSubset( subset = {
{ "DOCUMENT_ID": str(doc.pk),
"DOCUMENT_ID": str(doc.pk), "DOCUMENT_DOWNLOAD_URL": f"/api/documents/{doc.pk}/download/",
"DOCUMENT_DOWNLOAD_URL": f"/api/documents/{doc.pk}/download/", "DOCUMENT_THUMBNAIL_URL": f"/api/documents/{doc.pk}/thumb/",
"DOCUMENT_THUMBNAIL_URL": f"/api/documents/{doc.pk}/thumb/", "DOCUMENT_CORRESPONDENT": "my_bank",
"DOCUMENT_CORRESPONDENT": "my_bank", "DOCUMENT_TAGS": "a,b",
"DOCUMENT_TAGS": "a,b", }
},
environment, self.assertDictEqual(environment, {**environment, **subset})
)
def test_script_exit_non_zero(self): def test_script_exit_non_zero(self):
""" """

5
src/paperless_mail/tests/test_api.py
View File

@@ -2,12 +2,13 @@ from django.contrib.auth.models import User
from documents.models import Correspondent from documents.models import Correspondent
from documents.models import DocumentType from documents.models import DocumentType
from documents.models import Tag from documents.models import Tag
from documents.tests.utils import DirectoriesMixin
from paperless_mail.models import MailAccount from paperless_mail.models import MailAccount
from paperless_mail.models import MailRule from paperless_mail.models import MailRule
from rest_framework.test import APITestCase from rest_framework.test import APITestCase
class TestAPIMailAccounts(APITestCase): class TestAPIMailAccounts(DirectoriesMixin, APITestCase):
ENDPOINT = "/api/mail_accounts/" ENDPOINT = "/api/mail_accounts/"
def setUp(self): def setUp(self):
@@ -165,7 +166,7 @@ class TestAPIMailAccounts(APITestCase):
self.assertEqual(returned_account2.password, "123xyz") self.assertEqual(returned_account2.password, "123xyz")
class TestAPIMailRules(APITestCase): class TestAPIMailRules(DirectoriesMixin, APITestCase):
ENDPOINT = "/api/mail_rules/" ENDPOINT = "/api/mail_rules/"
def setUp(self): def setUp(self):