Improve metadata app tests pass rate for Python 3.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-09-06 16:55:48 -04:00
parent d3af59ec06
commit e41f2f73e7
5 changed files with 14 additions and 31 deletions

View File

@@ -8,9 +8,9 @@ from .literals import (
)
class MetadataTypeMixin(object):
class MetadataTypeTestMixin(object):
def setUp(self):
super(MetadataTypeMixin, self).setUp()
super(MetadataTypeTestMixin, self).setUp()
self.metadata_type = MetadataType.objects.create(
name=TEST_METADATA_TYPE_NAME, label=TEST_METADATA_TYPE_LABEL
)

View File

@@ -354,7 +354,7 @@ class DocumentMetadataAPITestCase(BaseAPITestCase):
metadata_type=self.metadata_type, required=False
)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
self.document = self.document_type.new_document(
file_object=file_object,
)

View File

@@ -6,10 +6,7 @@ from django.test import override_settings
from common.tests import BaseTestCase
from documents.models import DocumentType
from documents.tests import (
TEST_DOCUMENT_TYPE_2_LABEL, TEST_SMALL_DOCUMENT_PATH,
TEST_DOCUMENT_TYPE_LABEL
)
from documents.tests import DocumentTestMixin, TEST_DOCUMENT_TYPE_2_LABEL
from ..models import DocumentMetadata
@@ -18,28 +15,15 @@ from .literals import (
TEST_CORRECT_LOOKUP_VALUE, TEST_DATE_VALIDATOR, TEST_DATE_PARSER,
TEST_INVALID_DATE, TEST_VALID_DATE, TEST_PARSED_VALID_DATE
)
from .mixins import MetadataTypeMixin
from .mixins import MetadataTypeTestMixin
@override_settings(OCR_AUTO_OCR=False)
class MetadataTestCase(MetadataTypeMixin, BaseTestCase):
class MetadataTestCase(DocumentTestMixin, MetadataTypeTestMixin, BaseTestCase):
def setUp(self):
super(MetadataTestCase, self).setUp()
self.document_type = DocumentType.objects.create(
label=TEST_DOCUMENT_TYPE_LABEL
)
self.document_type.metadata.create(metadata_type=self.metadata_type)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
self.document = self.document_type.new_document(
file_object=file_object
)
def tearDown(self):
self.document_type.delete()
super(MetadataTestCase, self).tearDown()
def test_no_default(self):
document_metadata = DocumentMetadata(
document=self.document, metadata_type=self.metadata_type

View File

@@ -201,7 +201,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_metadata_document_add)
self.grant_permission(permission=permission_metadata_document_edit)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
document_2 = self.document_type.new_document(
file_object=File(file_object)
)
@@ -247,7 +247,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_document_view)
self.grant_permission(permission=permission_metadata_document_remove)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
document_2 = self.document_type.new_document(
file_object=File(file_object)
)
@@ -289,7 +289,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase):
self.grant_permission(permission=permission_metadata_document_add)
self.grant_permission(permission=permission_metadata_document_edit)
with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_object:
document_2 = self.document_type.new_document(
file_object=File(file_object)
)

View File

@@ -9,17 +9,16 @@ from documents.permissions import permission_document_create
from documents.tests import (
GenericDocumentViewTestCase, TEST_SMALL_DOCUMENT_PATH,
)
from metadata.tests.literals import TEST_METADATA_VALUE_UNICODE
from metadata.tests.mixins import MetadataTypeMixin
from sources.models import WebFormSource
from sources.tests.literals import (
TEST_SOURCE_LABEL, TEST_SOURCE_UNCOMPRESS_N,
)
from .literals import TEST_METADATA_VALUE_UNICODE
from .mixins import MetadataTypeTestMixin
class DocumentUploadMetadataTestCase(MetadataTypeMixin, GenericDocumentViewTestCase):
class DocumentUploadMetadataTestCase(MetadataTypeTestMixin, GenericDocumentViewTestCase):
def setUp(self):
super(DocumentUploadMetadataTestCase, self).setUp()
self.login_user()
@@ -43,7 +42,7 @@ class DocumentUploadMetadataTestCase(MetadataTypeMixin, GenericDocumentViewTestC
permission=permission_document_create, obj=self.document_type
)
# Upload the test document
with open(TEST_SMALL_DOCUMENT_PATH) as file_descriptor:
with open(TEST_SMALL_DOCUMENT_PATH, 'rb') as file_descriptor:
response = self.post(
path=url, data={
'document-language': 'eng', 'source-file': file_descriptor,