skip db test

common/djangoapps/util/tests/test_db.py

@@ -198,6 +198,9 @@ class MigrationTests(TestCase):
     """
 
     @override_settings(MIGRATION_MODULES={})
+    @unittest.skip(
+        "Temporary skip for https://openedx.atlassian.net/browse/PROD-1886 where a column is to be removed"
+    )
     def test_migrations_are_in_sync(self):
         """
         Tests that the migration files are in sync with the models.

openedx/core/djangoapps/video_pipeline/admin.py

@@ -34,7 +34,7 @@ class VEMPipelineIntegrationAdmin(ConfigurationModelAdmin):
 
 
 admin.site.register(VideoPipelineIntegration, ConfigurationModelAdmin)
-admin.site.register(VEMPipelineIntegration, ConfigurationModelAdmin)
+admin.site.register(VEMPipelineIntegration, VEMPipelineIntegrationAdmin)
 
 admin.site.register(VideoUploadsEnabledByDefault, ConfigurationModelAdmin)
 admin.site.register(CourseVideoUploadsEnabledByDefault, CourseVideoUploadsEnabledByDefaultAdmin)