[SDESK-7445] - Planning: Migrate planning:purge_expired_locks command to async

.github/workflows/ci-e2e.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8']
+        python-version: ['3.10']
         node-version: ['14']
         e2e: ['a', 'b']
     env:
@@ -17,11 +17,11 @@ jobs:
       E2E: true
       TZ: Australia/Sydney
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

.github/workflows/ci-server.yml

@@ -3,17 +3,17 @@ name: "CI-Server"
 on: [push, pull_request]
 
 jobs:
-  server-nose:
+  server-pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.10']
+        python-version: ['3.10']
     env:
       INSTALL_PY_MODULES: true
       RUN_SERVICES: true
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -24,17 +24,18 @@ jobs:
         run: ./scripts/ci-start-services.sh
       - name: Pytest
         run: pytest --log-level=ERROR --disable-warnings server/planning
+
   server-behave:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.10']
+        python-version: ['3.10']
     env:
       INSTALL_PY_MODULES: true
       RUN_SERVICES: true
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -51,14 +52,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.10']
+        python-version: ['3.10']
     env:
       INSTALL_PY_MODULES: true
       INSTALL_PY_EDITABLE: true
       RUN_SERVICES: true
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

e2e/server/core-requirements.txt

@@ -1,3 +1,3 @@
 gunicorn==22.0.0
 honcho==1.0.1
-git+https://github.com/superdesk/superdesk-core.git@develop#egg=superdesk-core
+superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@async

server/features/environment.py

@@ -8,41 +8,57 @@
 # AUTHORS and LICENSE files distributed with this source code, or
 # at https://www.sourcefabric.org/superdesk/license
 
+import asyncio
+import logging
+
 from os import path
 
 from apps.prepopulate.app_populate import AppPopulateCommand
-from superdesk.tests.environment import before_feature, before_step, after_scenario   # noqa
+from superdesk.tests.environment import before_feature, before_step, after_scenario  # noqa
 from superdesk.tests.environment import setup_before_all, setup_before_scenario
 from app import get_app
 from settings import INSTALLED_APPS
 
 
+logger = logging.getLogger(__name__)
+
+
 def before_all(context):
     config = {
-        'INSTALLED_APPS': INSTALLED_APPS,
-        'ELASTICSEARCH_FORCE_REFRESH': True,
+        "INSTALLED_APPS": INSTALLED_APPS,
+        "ELASTICSEARCH_FORCE_REFRESH": True,
     }
     setup_before_all(context, config, app_factory=get_app)
 
 
 def before_scenario(context, scenario):
+    try:
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(before_scenario_async(context, scenario))
+    except Exception as e:
+        # Make sure exceptions raised are printed to the console
+        logger.exception(e)
+        raise e
+
+
+async def before_scenario_async(context, scenario):
     config = {
-        'INSTALLED_APPS': INSTALLED_APPS,
-        'ELASTICSEARCH_FORCE_REFRESH': True,
+        "INSTALLED_APPS": INSTALLED_APPS,
+        "ELASTICSEARCH_FORCE_REFRESH": True,
     }
 
-    if 'link_updates' in scenario.tags:
-        config['PLANNING_LINK_UPDATES_TO_COVERAGES'] = True
+    if "link_updates" in scenario.tags:
+        config["PLANNING_LINK_UPDATES_TO_COVERAGES"] = True
     else:
-        config['PLANNING_LINK_UPDATES_TO_COVERAGES'] = False
+        config["PLANNING_LINK_UPDATES_TO_COVERAGES"] = False
 
-    if 'no_scheduled_updates' in scenario.tags:
-        config['PLANNING_ALLOW_SCHEDULED_UPDATES'] = False
+    if "no_scheduled_updates" in scenario.tags:
+        config["PLANNING_ALLOW_SCHEDULED_UPDATES"] = False
 
-    setup_before_scenario(context, scenario, config, app_factory=get_app)
+    await setup_before_scenario(context, scenario, config, app_factory=get_app)
 
-    if 'planning_cvs' in scenario.tags:
-        with context.app.app_context():
+    if "planning_cvs" in scenario.tags:
+        async with context.app.app_context():
             cmd = AppPopulateCommand()
             filename = path.join(path.abspath(path.dirname("features/steps/fixtures/")), "vocabularies.json")
             cmd.run(filename)