Fixed #20653 -- Renamed checksetup management command.
This is to allow future compatibility with work that is ongoing in the 2013 GSoC.
This commit is contained in:
parent
5a6f12182e
commit
0346563939
|
@ -1,7 +1,7 @@
|
|||
from __future__ import unicode_literals
|
||||
import warnings
|
||||
|
||||
from django.core.compat_checks import django_1_6_0
|
||||
from django.core.checks.compatibility import django_1_6_0
|
||||
|
||||
|
||||
COMPAT_CHECKS = [
|
|
@ -27,7 +27,7 @@ def check_test_runner():
|
|||
|
||||
def run_checks():
|
||||
"""
|
||||
Required by the ``checksetup`` management command, this returns a list of
|
||||
Required by the ``check`` management command, this returns a list of
|
||||
messages from all the relevant check functions for this version of Django.
|
||||
"""
|
||||
checks = [
|
|
@ -1,7 +1,7 @@
|
|||
from __future__ import unicode_literals
|
||||
import warnings
|
||||
|
||||
from django.core.compat_checks.base import check_compatibility
|
||||
from django.core.checks.compatibility.base import check_compatibility
|
||||
from django.core.management.base import NoArgsCommand
|
||||
|
||||
|
|
@ -121,10 +121,10 @@ GeoDjango now provides :ref:`form fields and widgets <ref-gis-forms-api>` for
|
|||
its geo-specialized fields. They are OpenLayers-based by default, but they can
|
||||
be customized to use any other JS framework.
|
||||
|
||||
``checksetup`` management command added for verifying compatibility
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
``check`` management command added for verifying compatibility
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
A ``checksetup`` management command was added, enabling you to verify if your
|
||||
A ``check`` management command was added, enabling you to verify if your
|
||||
current configuration (currently oriented at settings) is compatible with the
|
||||
current version of Django.
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from django.core.compat_checks import base
|
||||
from django.core.compat_checks import django_1_6_0
|
||||
from django.core.management.commands import checksetup
|
||||
from django.core.checks.compatibility import base
|
||||
from django.core.checks.compatibility import django_1_6_0
|
||||
from django.core.management.commands import check
|
||||
from django.core.management import call_command
|
||||
from django.test import TestCase
|
||||
|
||||
|
@ -86,22 +86,22 @@ class CompatChecksTestCase(TestCase):
|
|||
|
||||
def test_management_command(self):
|
||||
# Again, we unfortunately have to patch out ``warnings``. Different
|
||||
old_warnings = checksetup.warnings
|
||||
checksetup.warnings = FakeWarnings()
|
||||
old_warnings = check.warnings
|
||||
check.warnings = FakeWarnings()
|
||||
|
||||
self.assertEqual(len(checksetup.warnings._warnings), 0)
|
||||
self.assertEqual(len(check.warnings._warnings), 0)
|
||||
|
||||
# Should not produce any warnings.
|
||||
with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'):
|
||||
call_command('checksetup')
|
||||
call_command('check')
|
||||
|
||||
self.assertEqual(len(checksetup.warnings._warnings), 0)
|
||||
self.assertEqual(len(check.warnings._warnings), 0)
|
||||
|
||||
with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'):
|
||||
call_command('checksetup')
|
||||
call_command('check')
|
||||
|
||||
self.assertEqual(len(checksetup.warnings._warnings), 1)
|
||||
self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in checksetup.warnings._warnings[0])
|
||||
self.assertEqual(len(check.warnings._warnings), 1)
|
||||
self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in check.warnings._warnings[0])
|
||||
|
||||
# Restore the ``warnings``.
|
||||
base.warnings = old_warnings
|
Loading…
Reference in New Issue