From dae599b5178edc94e8e24660c2eaf80f1c1031ea Mon Sep 17 00:00:00 2001
From: DawoudSheraz <dawoud.sheraz@gmail.com>
Date: Wed, 5 Aug 2020 18:58:43 +0500
Subject: [PATCH] skip db test
---
common/djangoapps/util/tests/test_db.py | 3 +++
openedx/core/djangoapps/video_pipeline/admin.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/djangoapps/util/tests/test_db.py b/common/djangoapps/util/tests/test_db.py
index 108b66a8279..6563dfc9bdd 100644
--- a/common/djangoapps/util/tests/test_db.py
+++ b/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.
diff --git a/openedx/core/djangoapps/video_pipeline/admin.py b/openedx/core/djangoapps/video_pipeline/admin.py
index cec80cbe9ca..b04f9e45f41 100644
--- a/openedx/core/djangoapps/video_pipeline/admin.py
+++ b/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)
--
GitLab