Merge pull request #14088 from edx/benp/dont-skip-migration-test

Don't skip migration test

common/djangoapps/util/tests/test_db.py

@@ -4,14 +4,13 @@ import ddt
 import threading
 import time
 import unittest
-from unittest import skipIf
 
 from django.contrib.auth.models import User
 from django.core.management import call_command
-from django.conf import settings
 from django.db import connection, IntegrityError
 from django.db.transaction import atomic, TransactionManagementError
 from django.test import TestCase, TransactionTestCase
+from django.test.utils import override_settings
 
 from util.db import (
     commit_on_success, enable_named_outer_atomic, outer_atomic, generate_int_id, NoOpMigrationModules
@@ -215,11 +214,14 @@ class MigrationTests(TestCase):
     """
     Tests for migrations.
     """
-    @skipIf(isinstance(settings.MIGRATION_MODULES, NoOpMigrationModules), 'Skip in case of NoOpMigrationModules')
+    @override_settings(MIGRATION_MODULES={})
     def test_migrations_are_in_sync(self):
         """
         Tests that the migration files are in sync with the models.
         If this fails, you needs to run the Django command makemigrations.
+
+        The test is set up to override MIGRATION_MODULES to ensure migrations are
+        enabled for purposes of this test regardless of the overall test settings.
         """
         with self.assertRaises(SystemExit):
             call_command('makemigrations', '-e')