From bbc3505ef81768aa2afac8f73e6d45b5e8000c55 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 21 Oct 2014 20:54:32 +0200 Subject: [PATCH] Removed unneeded override_system_checks Refs #23685. --- .../gis/tests/gis_migrations/test_commands.py | 4 +-- tests/fixtures_model_package/tests.py | 3 -- tests/migrate_signals/tests.py | 4 --- tests/migrations/test_commands.py | 35 +------------------ tests/proxy_model_inheritance/tests.py | 5 +-- tests/test_runner/tests.py | 4 --- 6 files changed, 3 insertions(+), 52 deletions(-) diff --git a/django/contrib/gis/tests/gis_migrations/test_commands.py b/django/contrib/gis/tests/gis_migrations/test_commands.py index ebcf6eecd5..7b9e0a6382 100644 --- a/django/contrib/gis/tests/gis_migrations/test_commands.py +++ b/django/contrib/gis/tests/gis_migrations/test_commands.py @@ -3,8 +3,7 @@ from __future__ import unicode_literals from django.core.management import call_command from django.db import connection from django.test import ( - override_settings, override_system_checks, skipUnlessDBFeature, - TransactionTestCase + override_settings, skipUnlessDBFeature, TransactionTestCase ) @@ -27,7 +26,6 @@ class MigrateTests(TransactionTestCase): with connection.cursor() as cursor: self.assertNotIn(table, connection.introspection.table_names(cursor)) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"gis": "django.contrib.gis.tests.gis_migrations.migrations"}) def test_migrate_gis(self): """ diff --git a/tests/fixtures_model_package/tests.py b/tests/fixtures_model_package/tests.py index 506e5846cc..d9f8c7f490 100644 --- a/tests/fixtures_model_package/tests.py +++ b/tests/fixtures_model_package/tests.py @@ -5,7 +5,6 @@ import warnings from django.core import management from django.db import transaction from django.test import TestCase, TransactionTestCase -from django.test.utils import override_system_checks from django.utils.six import StringIO from .models import Article, Book @@ -31,7 +30,6 @@ class TestNoInitialDataLoading(TransactionTestCase): available_apps = ['fixtures_model_package'] - @override_system_checks([]) def test_migrate(self): with transaction.atomic(): Book.objects.all().delete() @@ -43,7 +41,6 @@ class TestNoInitialDataLoading(TransactionTestCase): ) self.assertQuerysetEqual(Book.objects.all(), []) - @override_system_checks([]) def test_flush(self): # Test presence of fixture (flush called by TransactionTestCase) self.assertQuerysetEqual( diff --git a/tests/migrate_signals/tests.py b/tests/migrate_signals/tests.py index 95c73f9901..883744b905 100644 --- a/tests/migrate_signals/tests.py +++ b/tests/migrate_signals/tests.py @@ -2,7 +2,6 @@ from django.apps import apps from django.core import management from django.db.models import signals from django.test import TestCase -from django.test.utils import override_system_checks from django.utils import six @@ -62,9 +61,6 @@ class MigrateSignalTests(TestCase): def test_pre_migrate_call_time(self): self.assertEqual(pre_migrate_receiver.call_counter, 1) - # `auth` app is imported, but not installed in this test, so we need to - # exclude checks registered by this app. - @override_system_checks([]) def test_pre_migrate_args(self): r = PreMigrateReceiver() signals.pre_migrate.connect(r, sender=APP_CONFIG) diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 798dd86fe5..88f58341f2 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -9,7 +9,7 @@ from django.apps import apps from django.db import connection, models from django.core.management import call_command, CommandError from django.db.migrations import questioner -from django.test import override_settings, override_system_checks +from django.test import override_settings from django.utils import six from django.utils._os import upath from django.utils.encoding import force_text @@ -23,10 +23,6 @@ class MigrateTests(MigrationTestBase): Tests running the migrate command. """ - # `auth` app is imported, but not installed in these tests (thanks to - # MigrationTestBase), so we need to exclude checks registered by this app. - - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"}) def test_migrate(self): """ @@ -55,7 +51,6 @@ class MigrateTests(MigrationTestBase): self.assertTableNotExists("migrations_tribble") self.assertTableNotExists("migrations_book") - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"}) def test_migrate_list(self): """ @@ -78,7 +73,6 @@ class MigrateTests(MigrationTestBase): # Cleanup by unmigrating everything call_command("migrate", "migrations", "zero", verbosity=0) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"}) def test_migrate_conflict_exit(self): """ @@ -87,7 +81,6 @@ class MigrateTests(MigrationTestBase): with self.assertRaises(CommandError): call_command("migrate", "migrations") - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"}) def test_sqlmigrate(self): """ @@ -116,7 +109,6 @@ class MigrateTests(MigrationTestBase): # Cleanup by unmigrating everything call_command("migrate", "migrations", "zero", verbosity=0) - @override_system_checks([]) @override_settings( INSTALLED_APPS=[ "migrations.migrations_test_apps.migrated_app", @@ -183,9 +175,6 @@ class MakeMigrationsTests(MigrationTestBase): return shutil.rmtree(dname) - # `auth` app is imported, but not installed in this test (thanks to - # MigrationTestBase), so we need to exclude checks registered by this app. - @override_system_checks([]) def test_files_content(self): self.assertTableNotExists("migrations_unicodemodel") apps.register_model('migrations', UnicodeModel) @@ -222,9 +211,6 @@ class MakeMigrationsTests(MigrationTestBase): self.assertTrue('\\xda\\xd1\\xcd\\xa2\\xd3\\xd0\\xc9' in content) # title.verbose_name self.assertTrue('\\u201c\\xd0j\\xe1\\xf1g\\xf3\\u201d' in content) # title.default - # `auth` app is imported, but not installed in this test (thanks to - # MigrationTestBase), so we need to exclude checks registered by this app. - @override_system_checks([]) def test_failing_migration(self): #21280 - If a migration fails to serialize, it shouldn't generate an empty file. apps.register_model('migrations', UnserializableModel) @@ -236,7 +222,6 @@ class MakeMigrationsTests(MigrationTestBase): initial_file = os.path.join(self.migration_dir, "0001_initial.py") self.assertFalse(os.path.exists(initial_file)) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"}) def test_makemigrations_conflict_exit(self): """ @@ -245,7 +230,6 @@ class MakeMigrationsTests(MigrationTestBase): with self.assertRaises(CommandError): call_command("makemigrations") - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"}) def test_makemigrations_merge_no_conflict(self): """ @@ -258,7 +242,6 @@ class MakeMigrationsTests(MigrationTestBase): self.fail("Makemigrations errored in merge mode with no conflicts") self.assertIn("No conflicts detected to merge.", stdout.getvalue()) - @override_system_checks([]) def test_makemigrations_no_app_sys_exit(self): """ Makes sure that makemigrations exits if a non-existent app is specified. @@ -268,7 +251,6 @@ class MakeMigrationsTests(MigrationTestBase): call_command("makemigrations", "this_app_does_not_exist", stderr=stderr) self.assertIn("'this_app_does_not_exist' could not be found.", stderr.getvalue()) - @override_system_checks([]) def test_makemigrations_empty_no_app_specified(self): """ Makes sure that makemigrations exits if no app is specified with 'empty' mode. @@ -276,7 +258,6 @@ class MakeMigrationsTests(MigrationTestBase): with override_settings(MIGRATION_MODULES={"migrations": self.migration_pkg}): self.assertRaises(CommandError, call_command, "makemigrations", empty=True) - @override_system_checks([]) def test_makemigrations_empty_migration(self): """ Makes sure that makemigrations properly constructs an empty migration. @@ -301,7 +282,6 @@ class MakeMigrationsTests(MigrationTestBase): self.assertIn('dependencies=[\n]', content) self.assertIn('operations=[\n]', content) - @override_system_checks([]) def test_makemigrations_no_changes_no_apps(self): """ Makes sure that makemigrations exits when there are no changes and no apps are specified. @@ -310,7 +290,6 @@ class MakeMigrationsTests(MigrationTestBase): call_command("makemigrations", stdout=stdout) self.assertIn("No changes detected", stdout.getvalue()) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_no_changes"}) def test_makemigrations_no_changes(self): """ @@ -320,7 +299,6 @@ class MakeMigrationsTests(MigrationTestBase): call_command("makemigrations", "migrations", stdout=stdout) self.assertIn("No changes detected in app 'migrations'", stdout.getvalue()) - @override_system_checks([]) def test_makemigrations_migrations_announce(self): """ Makes sure that makemigrations announces the migration at the default verbosity level. @@ -330,7 +308,6 @@ class MakeMigrationsTests(MigrationTestBase): call_command("makemigrations", "migrations", stdout=stdout) self.assertIn("Migrations for 'migrations'", stdout.getvalue()) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_no_ancestor"}) def test_makemigrations_no_common_ancestor(self): """ @@ -343,7 +320,6 @@ class MakeMigrationsTests(MigrationTestBase): self.assertIn("0002_second", exception_message) self.assertIn("0002_conflicting_second", exception_message) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"}) def test_makemigrations_interactive_reject(self): """ @@ -361,7 +337,6 @@ class MakeMigrationsTests(MigrationTestBase): finally: questioner.input = old_input - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"}) def test_makemigrations_interactive_accept(self): """ @@ -383,7 +358,6 @@ class MakeMigrationsTests(MigrationTestBase): questioner.input = old_input self.assertIn("Created new merge migration", stdout.getvalue()) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"}) def test_makemigrations_handle_merge(self): """ @@ -400,7 +374,6 @@ class MakeMigrationsTests(MigrationTestBase): self.assertFalse(os.path.exists(merge_file)) self.assertIn("Created new merge migration", stdout.getvalue()) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_no_default"}) def test_makemigrations_dry_run(self): """ @@ -419,7 +392,6 @@ class MakeMigrationsTests(MigrationTestBase): # Output the expected changes directly, without asking for defaults self.assertIn("Add field silly_date to sillymodel", stdout.getvalue()) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_no_default"}) def test_makemigrations_dry_run_verbosity_3(self): """ @@ -450,7 +422,6 @@ class MakeMigrationsTests(MigrationTestBase): self.assertIn("model_name='sillymodel',", stdout.getvalue()) self.assertIn("name='silly_char',", stdout.getvalue()) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_path_doesnt_exist.foo.bar"}) def test_makemigrations_migrations_modules_path_not_exist(self): """ @@ -476,7 +447,6 @@ class MakeMigrationsTests(MigrationTestBase): "test_migrations_path_doesnt_exist", "foo", "bar", "0001_initial.py"))) - @override_system_checks([]) @override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations_conflict"}) def test_makemigrations_interactive_by_default(self): """ @@ -501,7 +471,6 @@ class MakeMigrationsTests(MigrationTestBase): os.remove(merge_file) self.assertNotIn("Created new merge migration", stdout.getvalue()) - @override_system_checks([]) @override_settings( MIGRATION_MODULES={"migrations": "migrations.test_migrations_no_changes"}, INSTALLED_APPS=[ @@ -517,7 +486,6 @@ class MakeMigrationsTests(MigrationTestBase): except CommandError: self.fail("Makemigrations fails resolving conflicts in an unspecified app") - @override_system_checks([]) @override_settings( INSTALLED_APPS=[ "migrations.migrations_test_apps.migrated_app", @@ -547,7 +515,6 @@ class MakeMigrationsTests(MigrationTestBase): if os.path.exists(merge_file): os.remove(merge_file) - @override_system_checks([]) def test_makemigrations_with_custom_name(self): """ Makes sure that makemigrations generate a custom migration. diff --git a/tests/proxy_model_inheritance/tests.py b/tests/proxy_model_inheritance/tests.py index ec9e4c5a78..78e3c2607e 100644 --- a/tests/proxy_model_inheritance/tests.py +++ b/tests/proxy_model_inheritance/tests.py @@ -4,7 +4,7 @@ import os from django.core.management import call_command from django.test import TestCase, TransactionTestCase -from django.test.utils import override_system_checks, extend_sys_path +from django.test.utils import extend_sys_path from django.utils._os import upath from .models import (ConcreteModel, ConcreteModelSubclass, @@ -19,9 +19,6 @@ class ProxyModelInheritanceTests(TransactionTestCase): """ available_apps = [] - # `auth` app is imported, but not installed in this test, so we need to - # exclude checks registered by this app. - @override_system_checks([]) def test_table_exists(self): with extend_sys_path(os.path.dirname(os.path.abspath(upath(__file__)))): with self.modify_settings(INSTALLED_APPS={'append': ['app1', 'app2']}): diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index aec209a852..55e7a82a96 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -11,7 +11,6 @@ from django.core.management import call_command from django.db.backends.dummy.base import DatabaseCreation from django.test import runner, TestCase, TransactionTestCase, skipUnlessDBFeature from django.test.testcases import connections_support_transactions -from django.test.utils import override_system_checks from django.utils import six from admin_scripts.tests import AdminScriptTestCase @@ -225,9 +224,6 @@ class Sqlite3InMemoryTestDbs(TestCase): available_apps = [] - # `setup_databases` triggers system check framework, but we do not want to - # perform checks. - @override_system_checks([]) @unittest.skipUnless(all(db.connections[conn].vendor == 'sqlite' for conn in db.connections), "This is an sqlite-specific issue") def test_transaction_support(self):