test: updates tests for opensearch 3

Signed-off-by: Pamfilos Fokianos <[email protected]>

Author: pamfilos

.github/workflows/web-api.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Run darker
         run: |
           pip install flake8
-          pip install darker[isort]
+          pip install darker[isort,black]
           darker . --check -i -L flake8
 
   python-tests:
@@ -78,7 +78,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install .
+          pip install ".[tests]"
 
       - name: Run integration and unit tests
         run: ./run-tests.sh --check-pytest

cap/modules/experiments/utils/common.py

@@ -137,7 +137,7 @@ def _batches(iterable, chunk_size=10):
         for _, g in groupby(iterable, lambda _: next(c) // chunk_size):
             yield g
 
-    if es.indices.exists(prefix_index('{}-v1'.format(alias))):
+    if es.indices.exists(index=prefix_index('{}-v1'.format(alias))):
         old_index, new_index = (
             prefix_index('{}-v1'.format(alias)),
             prefix_index('{}-v2'.format(alias))
@@ -149,7 +149,7 @@ def _batches(iterable, chunk_size=10):
         )
 
     # recreate new index
-    if es.indices.exists(new_index):
+    if es.indices.exists(index=new_index):
         es.indices.delete(index=new_index)
     es.indices.create(index=new_index,
                       body=dict(mappings=mapping, settings=settings or {}))
@@ -175,5 +175,5 @@ def _batches(iterable, chunk_size=10):
     es.indices.put_alias(index=new_index, name=alias)
 
     # remove old index
-    if es.indices.exists(old_index):
+    if es.indices.exists(index=old_index):
         es.indices.delete(index=old_index)

cap/modules/schemas/models.py

@@ -510,14 +510,14 @@ def name_to_es_name(name):
 def create_index(index_name, mapping_body, aliases):
     """Create index in opensearch, add under given aliases."""
     prefixed_index = prefix_index(index_name)
-    if not es.indices.exists(prefixed_index):
+    if not es.indices.exists(index=prefixed_index):
         current_search.mappings[prefixed_index] = {}  # invenio search needs it
 
         es.indices.create(index=prefixed_index, body=mapping_body, ignore=False)
 
         for alias in aliases:
             es.indices.update_aliases(
-                {'actions': [{'add': {'index': prefixed_index, 'alias': prefix_index(alias)}}]}
+                body= {'actions': [{'add': {'index': prefixed_index, 'alias': prefix_index(alias)}}]}
             )
 
 
@@ -564,8 +564,8 @@ def before_delete_schema(mapper, connect, schema):
             prefix_index(schema.record_index), 
             prefix_index(schema.deposit_index)
         ):
-            if es.indices.exists(index):
-                es.indices.delete(index)
+            if es.indices.exists(index=index):
+                es.indices.delete(index=index)
 
             # invenio search needs it
             mappings_imp = current_app.config.get('SEARCH_GET_MAPPINGS_IMP')

setup.py

@@ -15,17 +15,6 @@
 
 tests_require = [
     'check-manifest>=0.35',
-    # 'coverage>=5.2.1',
-    # 'isort>=4.3',
-    # 'mock>=2.0.0',
-    # 'pydocstyle>=2.0.0',
-    # 'pytest-cov==2.5.1',
-    # 'pytest-invenio>=1.0.5,<=1.3.4',
-    # 'pytest-mock>=1.6.0',
-    # 'pytest-pep8>=1.0.6',
-    # 'pytest-random-order>=0.5.4',
-    # 'pytest==5.3.5',
-    # 'responses==0.10.6',
     'pytest-cov>=3',
     'pytest>=7',
     'responses>=0.22.0',
@@ -37,15 +26,15 @@
 for reqs in extras_require.values():
     extras_require['all'].extend(reqs)
 
-extras_require['ldap'] = ['python-ldap>=2.4.39']
+extras_require['ldap'] = ['python-ldap>=3.1.0']
 
 # Do not include in all requirement
 extras_require['xrootd'] = [
     # 'invenio-xrootd>=1.0.0a6',
     # 'xrootdpyfs>=0.1.5',
 ]
 
-setup_requires = ['Babel>=2.4.0', 'pytest-runner>=3.0.0,<5']
+setup_requires = ['Babel>=2.4.0']
 
 install_requires = [
     # CAP Base
@@ -266,7 +255,6 @@
     extras_require=extras_require,
     install_requires=install_requires,
     setup_requires=setup_requires,
-    tests_require=tests_require,
     classifiers=[
         'Environment :: Web Environment',
         'Intended Audience :: Developers',

tests/integration/deposits/test_review_deposit.py

@@ -131,12 +131,23 @@ def test_deposit_review_create_reviewable(
 
     assert resp.status_code == 400
 
+    # comment without body should fail
     resp = client.post(f'/deposits/{reviewable_id}/actions/review',
                        data=json.dumps({
                            "id": review_item_id,
                            "action": "comment"
                        }),
                        headers=default_headers + auth_headers_for_user(owner))
+    assert resp.status_code == 400
+
+    # comment with body should succeed
+    resp = client.post(f'/deposits/{reviewable_id}/actions/review',
+                       data=json.dumps({
+                           "id": review_item_id,
+                           "action": "comment",
+                           "body": "This is a comment"
+                       }),
+                       headers=default_headers + auth_headers_for_user(owner))
     assert resp.status_code == 201
 
     resp = client.post(f'/deposits/{reviewable_id}/actions/review',

tests/integration/repos/test_upload_with_github.py

@@ -806,7 +806,7 @@ def get_file_contents(self, filepath, ref):
         body=file_tar,
         content_type='text/plain',
         headers={
-            'Content-Length': '18',
+            'Content-Length': str(len(file_tar)),
             'Content-Encoding': 'gzip'
         },
         stream=True,
@@ -858,7 +858,7 @@ def get_file_contents(self, filepath, ref):
         body=file_tar,
         content_type='text/plain',
         headers={
-            'Content-Length': '18',
+            'Content-Length': str(len(file_tar)),
             'Content-Encoding': 'gzip'
         },
         stream=True,

tests/unit/repos/test_repos_tasks.py

@@ -74,7 +74,7 @@ def test_download_repo_file(deposit, file_tar):
         body=file_tar,
         content_type='text/plain',
         headers={
-            'Content-Length': '18',
+            'Content-Length': str(len(file_tar)),
             'Content-Encoding': 'gzip'
         },
         stream=True,
@@ -108,7 +108,7 @@ def test_download_repo_file_when_failed_creates_empty_file_object_with_failed_ta
         body=file_tar,
         content_type='text/plain',
         headers={
-            'Content-Length': '18',
+            'Content-Length': str(len(file_tar)),
             'Content-Encoding': 'gzip'
         },
         stream=True,

tests/unit/schemas/test_model.py

@@ -260,10 +260,10 @@ def test_on_save_mapping_is_created_and_index_name_added_to_mappings_map(
     )
     assert 'records-cms-schema-v1.0.0' in current_search.mappings.keys()
 
-    assert es.indices.exists(prefix_index('deposits-records-cms-schema-v1.0.0'))
-    assert es.indices.exists(prefix_index('records-cms-schema-v1.0.0'))
+    assert es.indices.exists(index=prefix_index('deposits-records-cms-schema-v1.0.0'))
+    assert es.indices.exists(index=prefix_index('records-cms-schema-v1.0.0'))
 
-    assert es.indices.get_mapping(prefix_index('records-cms-schema-v1.0.0')) == {
+    assert es.indices.get_mapping(index=prefix_index('records-cms-schema-v1.0.0')) == {
         prefix_index('records-cms-schema-v1.0.0'):
             {
                 'mappings': {
@@ -276,7 +276,7 @@ def test_on_save_mapping_is_created_and_index_name_added_to_mappings_map(
             }
     }
 
-    assert es.indices.get_mapping(prefix_index('deposits-records-cms-schema-v1.0.0')) == {
+    assert es.indices.get_mapping(index=prefix_index('deposits-records-cms-schema-v1.0.0')) == {
         prefix_index('deposits-records-cms-schema-v1.0.0'):
             {
                 'mappings':
@@ -293,8 +293,8 @@ def test_on_save_mapping_is_created_and_index_name_added_to_mappings_map(
     db.session.delete(schema)
     db.session.commit()
 
-    assert not es.indices.exists(prefix_index('deposits-records-cms-schema-v1.0.0'))
-    assert not es.indices.exists(prefix_index('records-cms-schema-v1.0.0'))
+    assert not es.indices.exists(index=prefix_index('deposits-records-cms-schema-v1.0.0'))
+    assert not es.indices.exists(index=prefix_index('records-cms-schema-v1.0.0'))
 
     assert 'deposits-records-cms-schema-v1.0.0' not in current_search.mappings.keys(
     )