mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-31 19:46:42 +00:00
Code Issues 32 Releases Wiki Activity

Removed need for hasattr(check, 'tags') in CheckRegistry.

Browse Source 
It was needed to pass tests because registered checks weren't properly mocked.
This commit is contained in:
Sergey Fedoseev 2017-08-22 00:34:20 +05:00 committed by Tim Graham
parent 8d095c6378
commit 30eb92fc11
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/core/checks/registry.py
View File

@ -66,13 +66,11 @@ class CheckRegistry:
checks = self.get_checks(include_deployment_checks) checks = self.get_checks(include_deployment_checks)
if tags is not None: if tags is not None:
checks = [check for check in checks checks = [check for check in checks if not set(check.tags).isdisjoint(tags)]
if hasattr(check, 'tags') and not set(check.tags).isdisjoint(tags)]
else: else:
# By default, 'database'-tagged checks are not run as they do more # By default, 'database'-tagged checks are not run as they do more
# than mere static code analysis. # than mere static code analysis.
checks = [check for check in checks checks = [check for check in checks if Tags.database not in check.tags]
if not hasattr(check, 'tags') or Tags.database not in check.tags]
for check in checks: for check in checks:
new_errors = check(app_configs=app_configs) new_errors = check(app_configs=app_configs)
@ -88,7 +86,6 @@ class CheckRegistry:
def tags_available(self, deployment_checks=False): def tags_available(self, deployment_checks=False):
return set(chain.from_iterable( return set(chain.from_iterable(
check.tags for check in self.get_checks(deployment_checks) check.tags for check in self.get_checks(deployment_checks)
if hasattr(check, 'tags')
)) ))
def get_checks(self, include_deployment_checks=False): def get_checks(self, include_deployment_checks=False):

8
django/test/utils.py
View File

@ -499,10 +499,14 @@ class override_system_checks(TestContextDecorator):
def enable(self): def enable(self):
self.old_checks = self.registry.registered_checks self.old_checks = self.registry.registered_checks
self.registry.registered_checks = self.new_checks self.registry.registered_checks = []
for check in self.new_checks:
self.registry.register(check, *getattr(check, 'tags', ()))
self.old_deployment_checks = self.registry.deployment_checks self.old_deployment_checks = self.registry.deployment_checks
if self.deployment_checks is not None: if self.deployment_checks is not None:
self.registry.deployment_checks = self.deployment_checks self.registry.deployment_checks = []
for check in self.deployment_checks:
self.registry.register(check, *getattr(check, 'tags', ()), deploy=True)
def disable(self): def disable(self):
self.registry.registered_checks = self.old_checks self.registry.registered_checks = self.old_checks