Merge pull request #24525 from open-craft/fix-failing-non-indexable-test

[BD-29] [TNL-6993] [BB-2602] Fix failing non-indexable tests

cms/djangoapps/contentstore/tests/test_courseware_index.py

@@ -18,6 +18,7 @@ from mock import patch
 from pytz import UTC
 from search.search_engine_base import SearchEngine
 from six.moves import range
+from xblock.core import XBlock
 
 from contentstore.courseware_index import (
     CourseAboutSearchIndexer,
@@ -54,6 +55,10 @@ from xmodule.partitions.partitions import UserPartition
 from xmodule.tests import DATA_DIR
 from xmodule.x_module import XModuleMixin
 
+
+class NonIndexableXBlock(XBlock):
+    """XBlock for testing indexibility"""
+
 COURSE_CHILD_STRUCTURE = {
     "course": "chapter",
     "chapter": "sequential",
@@ -348,6 +353,7 @@ class TestCoursewareSearchIndexer(MixedWithOptionsTestCase):
         response = self.search()
         self.assertEqual(response["total"], 3)
 
+    @XBlock.register_temp_plugin(NonIndexableXBlock)
     def _test_not_indexable(self, store):
         """ test not indexable items """
         # Publish the vertical to start with
@@ -359,7 +365,7 @@ class TestCoursewareSearchIndexer(MixedWithOptionsTestCase):
         # Add a non-indexable item
         ItemFactory.create(
             parent_location=self.vertical.location,
-            category="openassessment",
+            category="nonindexablexblock",
             display_name="Some other content",
             publish_item=False,
             modulestore=store,
@@ -897,6 +903,7 @@ class TestLibrarySearchIndexer(MixedWithOptionsTestCase):
         response = self.search()
         self.assertEqual(response["total"], 1)
 
+    @XBlock.register_temp_plugin(NonIndexableXBlock)
     def _test_not_indexable(self, store):
         """ test not indexable items """
         self.reindex_library(store)
@@ -906,7 +913,7 @@ class TestLibrarySearchIndexer(MixedWithOptionsTestCase):
         # Add a non-indexable item
         ItemFactory.create(
             parent_location=self.library.location,
-            category="openassessment",
+            category="nonindexablexblock",
             display_name="Assessment",
             publish_item=False,
             modulestore=store,

requirements/constraints.txt

@@ -115,7 +115,3 @@ numpy<1.19
 
 # scipy 1.5 equires Python 3.6
 scipy<1.5
-
-
-# latest ora causing failures
-ora2==2.8.6

requirements/edx/base.txt

@@ -165,7 +165,7 @@ nodeenv==1.4.0            # via -r requirements/edx/base.in
 numpy==1.18.5             # via -c requirements/edx/../constraints.txt, chem, openedx-calc, scipy
 oauthlib==3.0.1           # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core
 openedx-calc==1.0.9       # via -r requirements/edx/base.in
-ora2==2.8.6               # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
+ora2==2.8.8               # via -r requirements/edx/base.in
 packaging==20.4           # via bleach, drf-yasg
 path.py==12.4.0           # via edx-enterprise, edx-i18n-tools, ora2, xmodule
 path==13.1.0              # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py

requirements/edx/development.txt

@@ -200,7 +200,7 @@ nodeenv==1.4.0            # via -r requirements/edx/testing.txt
 numpy==1.18.5             # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, chem, openedx-calc, scipy
 oauthlib==3.0.1           # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core
 openedx-calc==1.0.9       # via -r requirements/edx/testing.txt
-ora2==2.8.6               # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
+ora2==2.8.8               # via -r requirements/edx/testing.txt
 packaging==20.4           # via -r requirements/edx/testing.txt, bleach, drf-yasg, pytest, sphinx, tox
 path.py==12.4.0           # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule
 path==13.1.0              # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, path.py

requirements/edx/testing.txt

@@ -192,7 +192,7 @@ nodeenv==1.4.0            # via -r requirements/edx/base.txt
 numpy==1.18.5             # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, chem, openedx-calc, scipy
 oauthlib==3.0.1           # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core
 openedx-calc==1.0.9       # via -r requirements/edx/base.txt
-ora2==2.8.6               # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
+ora2==2.8.8               # via -r requirements/edx/base.txt
 packaging==20.4           # via -r requirements/edx/base.txt, bleach, drf-yasg, pytest, tox
 path.py==12.4.0           # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule
 path==13.1.0              # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, path.py