Search: Fix failing tests

The SearchModel class no longer returns an elapsed time
value. Update the tests and views that expect this removed
variable.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

mayan/apps/documents/tests/test_search.py

@@ -21,23 +21,23 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
         )
 
     def test_document_page_search_no_access(self):
-        queryset, elapsed_time = self._perform_document_page_search()
+        queryset = self._perform_document_page_search()
         self.assertFalse(self.document.pages.first() in queryset)
 
     def test_document_page_search_with_access(self):
         self.grant_access(
             permission=permission_document_view, obj=self.document
         )
-        queryset, elapsed_time = self._perform_document_page_search()
+        queryset = self._perform_document_page_search()
         self.assertTrue(self.document.pages.first() in queryset)
 
     def test_document_search_no_access(self):
-        queryset, elapsed_time = self._perform_document_search()
+        queryset = self._perform_document_search()
         self.assertFalse(self.document in queryset)
 
     def test_document_search_with_access(self):
         self.grant_access(
             permission=permission_document_view, obj=self.document
         )
-        queryset, elapsed_time = self._perform_document_search()
+        queryset = self._perform_document_search()
         self.assertTrue(self.document in queryset)

mayan/apps/dynamic_search/api_views.py

@@ -29,7 +29,7 @@ class APISearchView(SearchModelMixin, generics.ListAPIView):
             self.mayan_object_permissions = {'GET': (search_model.permission,)}
 
         try:
-            queryset, timedelta = search_model.search(
+            queryset = search_model.search(
                 query_string=self.request.GET, user=self.request.user
             )
         except Exception as exception:
@@ -68,7 +68,7 @@ class APIAdvancedSearchView(SearchModelMixin, generics.ListAPIView):
             global_and_search = False
 
         try:
-            queryset, timedelta = self.search_model.search(
+            queryset = self.search_model.search(
                 query_string=self.request.GET, user=self.request.user,
                 global_and_search=global_and_search
             )

mayan/apps/dynamic_search/tests/test_models.py

@@ -20,7 +20,7 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
         document versions and document version pages
         """
         self.document = self.upload_document()
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'q': 'Mayan'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 1)
@@ -29,14 +29,14 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
     def test_advanced_search_after_related_name_change(self):
         # Test versions__filename
         self.document = self.upload_document()
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'label': self.document.label}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 1)
         self.assertTrue(self.document in queryset)
 
         # Test versions__mimetype
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'versions__mimetype': self.document.file_mimetype},
             user=self.admin_user
         )
@@ -50,7 +50,7 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
         self.document_2.label = 'second_doc.pdf'
         self.document_2.save()
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'q': 'Mayan OR second'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 2)
@@ -63,12 +63,12 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
         self.document_2.label = 'second_doc.pdf'
         self.document_2.save()
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'q': 'non_valid second'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 0)
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'q': 'second non_valid'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 0)
@@ -79,27 +79,27 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase):
         self.document_2.label = 'second_doc.pdf'
         self.document_2.save()
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'q': '-non_valid second'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 1)
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'label': '-second'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 0)
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'label': '-second -Mayan'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 0)
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'label': '-second OR -Mayan'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 1)
 
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'label': '-non_valid -second'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), 0)

mayan/apps/dynamic_search/tests/test_views.py

@@ -38,7 +38,7 @@ class Issue46TestCase(GenericViewTestCase):
 
     def test_advanced_search_past_first_page(self):
         # Make sure all documents are returned by the search
-        queryset, elapsed_time = document_search.search(
+        queryset = document_search.search(
             {'label': 'test document'}, user=self.admin_user
         )
         self.assertEqual(queryset.count(), self.document_count)