From 0346563939396fb89dec8df31f82eaefaaeb8616 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 25 Jun 2013 09:37:54 +0800 Subject: Fixed #20653 -- Renamed checksetup management command. This is to allow future compatibility with work that is ongoing in the 2013 GSoC. --- tests/check/__init__.py | 0 tests/check/models.py | 1 + tests/check/tests.py | 107 ++++++++++++++++++++++++++++++++++++++++ tests/compat_checks/__init__.py | 0 tests/compat_checks/models.py | 1 - tests/compat_checks/tests.py | 107 ---------------------------------------- 6 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 tests/check/__init__.py create mode 100644 tests/check/models.py create mode 100644 tests/check/tests.py delete mode 100644 tests/compat_checks/__init__.py delete mode 100644 tests/compat_checks/models.py delete mode 100644 tests/compat_checks/tests.py (limited to 'tests') diff --git a/tests/check/__init__.py b/tests/check/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/check/models.py b/tests/check/models.py new file mode 100644 index 0000000000..78a10abba6 --- /dev/null +++ b/tests/check/models.py @@ -0,0 +1 @@ +# Stubby. diff --git a/tests/check/tests.py b/tests/check/tests.py new file mode 100644 index 0000000000..98495e38ae --- /dev/null +++ b/tests/check/tests.py @@ -0,0 +1,107 @@ +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 + + +class StubCheckModule(object): + # Has no ``run_checks`` attribute & will trigger a warning. + __name__ = 'StubCheckModule' + + +class FakeWarnings(object): + def __init__(self): + self._warnings = [] + + def warn(self, message): + self._warnings.append(message) + + +class CompatChecksTestCase(TestCase): + def setUp(self): + super(CompatChecksTestCase, self).setUp() + + # We're going to override the list of checks to perform for test + # consistency in the future. + self.old_compat_checks = base.COMPAT_CHECKS + base.COMPAT_CHECKS = [ + django_1_6_0, + ] + + def tearDown(self): + # Restore what's supposed to be in ``COMPAT_CHECKS``. + base.COMPAT_CHECKS = self.old_compat_checks + super(CompatChecksTestCase, self).tearDown() + + def test_check_test_runner_new_default(self): + with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): + result = django_1_6_0.check_test_runner() + self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result) + + def test_check_test_runner_overridden(self): + with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): + self.assertEqual(django_1_6_0.check_test_runner(), None) + + def test_run_checks_new_default(self): + with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): + result = django_1_6_0.run_checks() + self.assertEqual(len(result), 1) + self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result[0]) + + def test_run_checks_overridden(self): + with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): + self.assertEqual(len(django_1_6_0.run_checks()), 0) + + def test_check_compatibility(self): + with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): + result = base.check_compatibility() + self.assertEqual(len(result), 1) + self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result[0]) + + with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): + self.assertEqual(len(base.check_compatibility()), 0) + + def test_check_compatibility_warning(self): + # First, we're patching over the ``COMPAT_CHECKS`` with a stub which + # will trigger the warning. + base.COMPAT_CHECKS = [ + StubCheckModule(), + ] + + # Next, we unfortunately have to patch out ``warnings``. + old_warnings = base.warnings + base.warnings = FakeWarnings() + + self.assertEqual(len(base.warnings._warnings), 0) + + with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): + self.assertEqual(len(base.check_compatibility()), 0) + + self.assertEqual(len(base.warnings._warnings), 1) + self.assertTrue("The 'StubCheckModule' module lacks a 'run_checks'" in base.warnings._warnings[0]) + + # Restore the ``warnings``. + base.warnings = old_warnings + + def test_management_command(self): + # Again, we unfortunately have to patch out ``warnings``. Different + old_warnings = check.warnings + check.warnings = FakeWarnings() + + self.assertEqual(len(check.warnings._warnings), 0) + + # Should not produce any warnings. + with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): + call_command('check') + + self.assertEqual(len(check.warnings._warnings), 0) + + with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): + call_command('check') + + 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 diff --git a/tests/compat_checks/__init__.py b/tests/compat_checks/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/compat_checks/models.py b/tests/compat_checks/models.py deleted file mode 100644 index 78a10abba6..0000000000 --- a/tests/compat_checks/models.py +++ /dev/null @@ -1 +0,0 @@ -# Stubby. diff --git a/tests/compat_checks/tests.py b/tests/compat_checks/tests.py deleted file mode 100644 index 879988c905..0000000000 --- a/tests/compat_checks/tests.py +++ /dev/null @@ -1,107 +0,0 @@ -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.management import call_command -from django.test import TestCase - - -class StubCheckModule(object): - # Has no ``run_checks`` attribute & will trigger a warning. - __name__ = 'StubCheckModule' - - -class FakeWarnings(object): - def __init__(self): - self._warnings = [] - - def warn(self, message): - self._warnings.append(message) - - -class CompatChecksTestCase(TestCase): - def setUp(self): - super(CompatChecksTestCase, self).setUp() - - # We're going to override the list of checks to perform for test - # consistency in the future. - self.old_compat_checks = base.COMPAT_CHECKS - base.COMPAT_CHECKS = [ - django_1_6_0, - ] - - def tearDown(self): - # Restore what's supposed to be in ``COMPAT_CHECKS``. - base.COMPAT_CHECKS = self.old_compat_checks - super(CompatChecksTestCase, self).tearDown() - - def test_check_test_runner_new_default(self): - with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): - result = django_1_6_0.check_test_runner() - self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result) - - def test_check_test_runner_overridden(self): - with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): - self.assertEqual(django_1_6_0.check_test_runner(), None) - - def test_run_checks_new_default(self): - with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): - result = django_1_6_0.run_checks() - self.assertEqual(len(result), 1) - self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result[0]) - - def test_run_checks_overridden(self): - with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): - self.assertEqual(len(django_1_6_0.run_checks()), 0) - - def test_check_compatibility(self): - with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): - result = base.check_compatibility() - self.assertEqual(len(result), 1) - self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result[0]) - - with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): - self.assertEqual(len(base.check_compatibility()), 0) - - def test_check_compatibility_warning(self): - # First, we're patching over the ``COMPAT_CHECKS`` with a stub which - # will trigger the warning. - base.COMPAT_CHECKS = [ - StubCheckModule(), - ] - - # Next, we unfortunately have to patch out ``warnings``. - old_warnings = base.warnings - base.warnings = FakeWarnings() - - self.assertEqual(len(base.warnings._warnings), 0) - - with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): - self.assertEqual(len(base.check_compatibility()), 0) - - self.assertEqual(len(base.warnings._warnings), 1) - self.assertTrue("The 'StubCheckModule' module lacks a 'run_checks'" in base.warnings._warnings[0]) - - # Restore the ``warnings``. - base.warnings = old_warnings - - def test_management_command(self): - # Again, we unfortunately have to patch out ``warnings``. Different - old_warnings = checksetup.warnings - checksetup.warnings = FakeWarnings() - - self.assertEqual(len(checksetup.warnings._warnings), 0) - - # Should not produce any warnings. - with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'): - call_command('checksetup') - - self.assertEqual(len(checksetup.warnings._warnings), 0) - - with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'): - call_command('checksetup') - - self.assertEqual(len(checksetup.warnings._warnings), 1) - self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in checksetup.warnings._warnings[0]) - - # Restore the ``warnings``. - base.warnings = old_warnings -- cgit v1.3