diff --git a/mayan/apps/common/tests/mixins.py b/mayan/apps/common/tests/mixins.py index cd7179f735..ebc3df4dca 100644 --- a/mayan/apps/common/tests/mixins.py +++ b/mayan/apps/common/tests/mixins.py @@ -8,10 +8,12 @@ import random from furl import furl +from django.apps import apps from django.conf import settings from django.conf.urls import url +from django.contrib.contenttypes.models import ContentType from django.core import management -from django.db import models +from django.db import connection, models from django.db.models.signals import post_save, pre_save from django.http import HttpResponse from django.template import Context, Template @@ -212,19 +214,27 @@ class RandomPrimaryKeyModelMonkeyPatchMixin(object): class SilenceLoggerTestCaseMixin(object): - test_case_logger = None + """ + Changes the log level of a specific logger for the duration of a test. + The default level for silenced loggers is CRITICAL. + Example: self._silence_logger(name='mayan.apps.converter.managers') + """ + test_case_silenced_logger = None + test_case_silenced_logger_new_level = logging.CRITICAL def tearDown(self): - if self.test_case_logger: - self.test_case_logger.setLevel(level=self.test_case_logger_level) + if self.test_case_silenced_logger: + self.test_case_silenced_logger.setLevel( + level=self.test_case_silenced_logger_level + ) super(SilenceLoggerTestCaseMixin, self).tearDown() def _silence_logger(self, name): - self.test_case_logger = logging.getLogger(name=name) - self.test_case_logger_level = self.test_case_logger.level - self.test_case_logger.setLevel( - level=logging.CRITICAL + self.test_case_silenced_logger = logging.getLogger(name=name) + self.test_case_silenced_logger_level = self.test_case_silenced_logger.level + self.test_case_silenced_logger.setLevel( + level=self.test_case_silenced_logger_new_level ) diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py index 8925ea8d29..61a9b37f7e 100644 --- a/mayan/apps/common/views.py +++ b/mayan/apps/common/views.py @@ -52,7 +52,7 @@ class CheckVersionView(SimpleView): 'The version you are using is outdated. The latest version ' 'is %s' ) % exception.upstream_version - except UnknownLatestVersion as exception: + except UnknownLatestVersion: message = _( 'It is not possible to determine the latest version ' 'available.' diff --git a/mayan/apps/document_states/tests/test_models.py b/mayan/apps/document_states/tests/test_indexing.py similarity index 100% rename from mayan/apps/document_states/tests/test_models.py rename to mayan/apps/document_states/tests/test_indexing.py