fixing tests and signals

Author: safwanrahman

conftest.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import pytest
+from django.conf import settings
 from rest_framework.test import APIClient
 
 try:
@@ -46,7 +47,6 @@ def pytest_configure(config):
 def settings_modification(settings):
     settings.CELERY_ALWAYS_EAGER = True
 
-
 @pytest.fixture
 def api_client():
     return APIClient()

readthedocs/projects/tasks.py

@@ -1017,7 +1017,7 @@ def _manage_imported_files(version, path, commit):
                 obj.commit = commit
             obj.save()
 
-            if isinstance(obj, HTMLFile):
+            if model_class == HTMLFile:
                 # the `obj` is HTMLFile, so add it to the list
                 created_html_files.append(obj)
 

readthedocs/search/documents.py

@@ -52,7 +52,7 @@ class PageDocument(RTDDocTypeMixin, DocType):
     class Meta(object):
         model = HTMLFile
         fields = ('commit',)
-        ignore_signals = True
+        ignore_signals = settings.ES_PAGE_IGNORE_SIGNALS
 
     project = fields.KeywordField(attr='project.slug')
     version = fields.KeywordField(attr='version.slug')

readthedocs/search/signals.py

@@ -24,7 +24,7 @@ def index_html_file(instance_list, **_):
         'objects_id': [obj.id for obj in instance_list],
     }
 
-    index_objects_to_es_task.delay(**kwargs)
+    index_objects_to_es_task(**kwargs)
 
 
 @receiver(bulk_post_delete, sender=HTMLFile)

readthedocs/search/tests/conftest.py

@@ -58,9 +58,5 @@ def get_dummy_processed_json(instance):
 
 @pytest.fixture(autouse=True)
 def mock_processed_json(mocker):
-
-    # patch the function from `projects.tasks` because it has been point to there
-    # http://www.voidspace.org.uk/python/mock/patch.html#where-to-patch
     mocked_function = mocker.patch.object(HTMLFile, 'get_processed_json', autospec=True)
     mocked_function.side_effect = get_dummy_processed_json
-

readthedocs/settings/base.py

@@ -326,6 +326,7 @@ def USE_PROMOS(self):  # noqa
     }
     # Chunk size for elasticsearch reindex celery tasks
     ES_TASK_CHUNK_SIZE = 100
+    ES_PAGE_IGNORE_SIGNALS = True
 
     # ANALYZER = 'analysis': {
     #     'analyzer': {

readthedocs/settings/test.py

@@ -16,6 +16,7 @@ class CommunityTestSettings(CommunityDevSettings):
 
     DEBUG = False
     TEMPLATE_DEBUG = False
+    ES_PAGE_IGNORE_SIGNALS = False
 
     @property
     def ES_INDEXES(self):  # noqa - avoid pep8 N802