Resolves minor flake8 warnings in the test suite

This commit is contained in:
Trenton H 2023-01-04 10:41:40 -08:00
parent d19bf59f47
commit 6ff28c92a4
12 changed files with 12 additions and 24 deletions

View File

@ -1,5 +1,3 @@
from unittest import mock
from django.contrib.admin.sites import AdminSite from django.contrib.admin.sites import AdminSite
from django.test import TestCase from django.test import TestCase
from django.utils import timezone from django.utils import timezone

View File

@ -33,7 +33,6 @@ from documents.models import SavedView
from documents.models import StoragePath from documents.models import StoragePath
from documents.models import Tag from documents.models import Tag
from documents.models import Comment from documents.models import Comment
from documents.models import StoragePath
from documents.tests.utils import DirectoriesMixin from documents.tests.utils import DirectoriesMixin
from paperless import version from paperless import version
from rest_framework.test import APITestCase from rest_framework.test import APITestCase
@ -480,7 +479,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
self.assertNotIn(result["id"], seen_ids) self.assertNotIn(result["id"], seen_ids)
seen_ids.append(result["id"]) seen_ids.append(result["id"])
response = self.client.get(f"/api/documents/?query=content&page=6&page_size=10") response = self.client.get("/api/documents/?query=content&page=6&page_size=10")
results = response.data["results"] results = response.data["results"]
self.assertEqual(response.data["count"], 55) self.assertEqual(response.data["count"], 55)
self.assertEqual(len(results), 5) self.assertEqual(len(results), 5)
@ -500,9 +499,9 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
) )
index.update_document(writer, doc) index.update_document(writer, doc)
response = self.client.get(f"/api/documents/?query=content&page=0&page_size=10") response = self.client.get("/api/documents/?query=content&page=0&page_size=10")
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
response = self.client.get(f"/api/documents/?query=content&page=3&page_size=10") response = self.client.get("/api/documents/?query=content&page=3&page_size=10")
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
@mock.patch("documents.index.autocomplete") @mock.patch("documents.index.autocomplete")
@ -1080,7 +1079,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
self.assertEqual(meta["archive_size"], os.stat(archive_file).st_size) self.assertEqual(meta["archive_size"], os.stat(archive_file).st_size)
def test_get_metadata_invalid_doc(self): def test_get_metadata_invalid_doc(self):
response = self.client.get(f"/api/documents/34576/metadata/") response = self.client.get("/api/documents/34576/metadata/")
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
def test_get_metadata_no_archive(self): def test_get_metadata_no_archive(self):
@ -1145,7 +1144,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
) )
def test_get_suggestions_invalid_doc(self): def test_get_suggestions_invalid_doc(self):
response = self.client.get(f"/api/documents/34676/suggestions/") response = self.client.get("/api/documents/34676/suggestions/")
self.assertEqual(response.status_code, 404) self.assertEqual(response.status_code, 404)
@mock.patch("documents.views.match_storage_paths") @mock.patch("documents.views.match_storage_paths")

View File

@ -401,7 +401,7 @@ class TestBarcode(DirectoriesMixin, TestCase):
self.assertEqual( self.assertEqual(
cm.output, cm.output,
[ [
f"WARNING:paperless.barcodes:No pages to split on!", "WARNING:paperless.barcodes:No pages to split on!",
], ],
) )

View File

@ -1,5 +1,4 @@
import textwrap import textwrap
import unittest
from unittest import mock from unittest import mock
from django.core.checks import Error from django.core.checks import Error

View File

@ -4,7 +4,6 @@ import re
import shutil import shutil
import stat import stat
import tempfile import tempfile
from subprocess import CalledProcessError
from unittest import mock from unittest import mock
from unittest.mock import MagicMock from unittest.mock import MagicMock

View File

@ -9,7 +9,6 @@ from django.test import override_settings
from django.test import TestCase from django.test import TestCase
from documents.parsers import parse_date from documents.parsers import parse_date
from documents.parsers import parse_date_generator from documents.parsers import parse_date_generator
from paperless.settings import DATE_ORDER
class TestDate(TestCase): class TestDate(TestCase):

View File

@ -88,10 +88,10 @@ class TestArchiver(DirectoriesMixin, TestCase):
mime_type="application/pdf", mime_type="application/pdf",
filename="document_01.pdf", filename="document_01.pdf",
) )
shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, f"document.pdf")) shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, "document.pdf"))
shutil.copy( shutil.copy(
sample_file, sample_file,
os.path.join(self.dirs.originals_dir, f"document_01.pdf"), os.path.join(self.dirs.originals_dir, "document_01.pdf"),
) )
update_document_archive_file(doc2.pk) update_document_archive_file(doc2.pk)
@ -150,7 +150,7 @@ class TestDecryptDocuments(TestCase):
"samples", "samples",
"documents", "documents",
"thumbnails", "thumbnails",
f"0000004.webp.gpg", "0000004.webp.gpg",
), ),
os.path.join(thumb_dir, f"{doc.id:07}.webp.gpg"), os.path.join(thumb_dir, f"{doc.id:07}.webp.gpg"),
) )

View File

@ -5,10 +5,7 @@ from unittest import mock
from django.core.management import call_command from django.core.management import call_command
from django.test import TestCase from django.test import TestCase
from documents.management.commands.document_thumbnails import _process_document from documents.management.commands.document_thumbnails import _process_document
from documents.models import Correspondent
from documents.models import Document from documents.models import Document
from documents.models import DocumentType
from documents.models import Tag
from documents.tests.utils import DirectoriesMixin from documents.tests.utils import DirectoriesMixin

View File

@ -7,7 +7,6 @@ from typing import Union
from unittest import mock from unittest import mock
from django.test import override_settings from django.test import override_settings
from documents.tests.test_migration_archive_files import thumbnail_path
from documents.tests.utils import TestMigrations from documents.tests.utils import TestMigrations

View File

@ -69,7 +69,7 @@ class BogusClient:
if message.uid == args[0]: if message.uid == args[0]:
flag = args[2] flag = args[2]
if flag == "processed": if flag == "processed":
message._raw_flag_data.append(f"+FLAGS (processed)".encode()) message._raw_flag_data.append(b"+FLAGS (processed)")
MailMessage.flags.fget.cache_clear() MailMessage.flags.fget.cache_clear()
@ -153,7 +153,7 @@ class BogusMailBox(ContextManager):
if flag == MailMessageFlags.SEEN: if flag == MailMessageFlags.SEEN:
message.seen = value message.seen = value
if flag == "processed": if flag == "processed":
message._raw_flag_data.append(f"+FLAGS (processed)".encode()) message._raw_flag_data.append(b"+FLAGS (processed)")
MailMessage.flags.fget.cache_clear() MailMessage.flags.fget.cache_clear()
def move(self, uid_list, folder): def move(self, uid_list, folder):
@ -223,7 +223,7 @@ def create_message(
imap_msg.seen = seen imap_msg.seen = seen
imap_msg.flagged = flagged imap_msg.flagged = flagged
if processed: if processed:
imap_msg._raw_flag_data.append(f"+FLAGS (processed)".encode()) imap_msg._raw_flag_data.append(b"+FLAGS (processed)")
MailMessage.flags.fget.cache_clear() MailMessage.flags.fget.cache_clear()
return imap_msg return imap_msg

View File

@ -6,7 +6,6 @@ from urllib.request import urlopen
import pytest import pytest
from django.test import TestCase from django.test import TestCase
from documents.parsers import ParseError
from documents.parsers import run_convert from documents.parsers import run_convert
from imagehash import average_hash from imagehash import average_hash
from paperless_mail.parsers import MailDocumentParser from paperless_mail.parsers import MailDocumentParser

View File

@ -5,7 +5,6 @@ from typing import Final
import pytest import pytest
from django.test import TestCase from django.test import TestCase
from documents.parsers import ParseError
from paperless_tika.parsers import TikaDocumentParser from paperless_tika.parsers import TikaDocumentParser