ruffed

Author: pcrespov

services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py

@@ -220,7 +220,6 @@ async def test_log_workflow(
     # project
     random_node_id_in_user_project: NodeID,
     user_project_id: ProjectID,
-    #
     faker: Faker,
     mocker: MockerFixture,
 ):
@@ -264,7 +263,6 @@ async def test_log_workflow_only_receives_messages_if_subscribed(
     # project
     random_node_id_in_user_project: NodeID,
     user_project_id: ProjectID,
-    #
     faker: Faker,
     mocker: MockerFixture,
 ):
@@ -333,7 +331,6 @@ async def test_progress_non_computational_workflow(
     # project
     random_node_id_in_user_project: NodeID,
     user_project_id: ProjectID,
-    #
     mocker: MockerFixture,
 ):
     """

services/web/server/tests/integration/02/scicrunch/test_scicrunch__rest.py

@@ -14,7 +14,6 @@
 """
 
 import os
-from pprint import pprint
 from typing import Any
 
 import pytest
@@ -48,7 +47,6 @@ async def test_scicrunch_openapi_specs(settings: SciCrunchSettings):
     async with ClientSession() as client:
         resp = await client.get(f"{SCICRUNCH_DEFAULT_URL}/swagger-docs/swagger.json")
         openapi_specs = await resp.json()
-        pprint(openapi_specs["info"])
 
         expected_api_version = 1
         assert openapi_specs["info"]["version"] == expected_api_version
@@ -65,7 +63,6 @@ async def test_scicrunch_get_all_versions(
 ):
     async with ClientSession() as client:
         versions = await get_all_versions(rrid, client, settings)
-        pprint(versions)
 
         assert versions
 
@@ -85,7 +82,6 @@ async def test_scicrunch_get_all_versions_with_invalid_rrids(
 ):
     async with ClientSession() as client:
         versions = await get_all_versions(rrid, client, settings)
-        pprint(versions)
 
         # invalid keys return success but an empty list of versions!
         assert isinstance(versions, list)

services/web/server/tests/integration/02/test_computation.py

@@ -199,7 +199,7 @@ def _assert_db_contents(
 
         for task_db in tasks_db:
             assert task_db.project_id == project_id
-            assert task_db.node_id in mock_pipeline.keys()
+            assert task_db.node_id in mock_pipeline
 
             assert task_db.inputs == mock_pipeline[task_db.node_id].get("inputs")
 

services/web/server/tests/unit/isolated/exporter/test_exporter_formatter_archive.py

@@ -1,8 +1,8 @@
 # pylint:disable=redefined-outer-name
 
 import tempfile
+from collections.abc import Iterator
 from pathlib import Path
-from typing import Iterator
 
 import pytest
 from faker import Faker

services/web/server/tests/unit/isolated/test__configs.py

@@ -16,7 +16,8 @@
 
 @pytest.fixture(scope="session")
 def app_config_schema():
-    raise RuntimeError("DEPRECATED. MUST NOT BE USED")
+    msg = "DEPRECATED. MUST NOT BE USED"
+    raise RuntimeError(msg)
 
 
 @pytest.fixture(scope="session")
@@ -33,16 +34,14 @@ def service_webserver_environ(
         ),  # defined if pip install --edit (but not in travis!)
     }
 
-    webserver_environ = eval_service_environ(
+    return eval_service_environ(
         services_docker_compose_file,
         "webserver",
         host_environ,
         image_environ,
         use_env_devel=True,
     )
 
-    return webserver_environ
-
 
 @pytest.fixture(scope="session")
 def app_submodules_with_setup_funs(package_dir: Path) -> set[ModuleType]:

services/web/server/tests/unit/isolated/test__redirections.py

@@ -5,9 +5,8 @@
 
 import asyncio
 import textwrap
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from pathlib import Path
-from typing import Awaitable
 
 import pytest
 from aiohttp import web
@@ -47,30 +46,32 @@ def client(
 
     @routes.get("/")
     async def get_root(_request):
-        raise web.HTTPOk()
+        raise web.HTTPOk
 
     @routes.get("/other")
     async def get_other(_request):
-        raise web.HTTPOk()
+        raise web.HTTPOk
 
     @routes.get("/redirect-to-other")
     async def get_redirect_to_other(request):
-        raise web.HTTPFound("/other")
+        msg = "/other"
+        raise web.HTTPFound(msg)
 
     @routes.get("/redirect-to-static")
     async def get_redirect_to_static(_request):
-        raise web.HTTPFound("/statics/index.html")
+        msg = "/statics/index.html"
+        raise web.HTTPFound(msg)
 
     @routes.get("/redirect-to-root")
     async def get_redirect_to_root(_request):
-        raise web.HTTPFound("/")
+        msg = "/"
+        raise web.HTTPFound(msg)
 
     routes.static("/statics", index_static_path)
 
     app = web.Application()
     app.add_routes(routes)
-    cli = event_loop.run_until_complete(aiohttp_client(app))
-    return cli
+    return event_loop.run_until_complete(aiohttp_client(app))
 
 
 @pytest.mark.parametrize("test_path", ["/", "/other"])
@@ -80,7 +81,7 @@ async def test_preserves_fragments(client, test_path):
     assert resp.real_url.fragment == "this/is/a/fragment"
 
 
-@pytest.mark.xfail
+@pytest.mark.xfail()
 @pytest.mark.parametrize(
     "test_path,expected_redirected_path",
     [

services/web/server/tests/unit/isolated/test_login_settings.py

@@ -34,7 +34,7 @@ def twilio_config(monkeypatch: pytest.MonkeyPatch) -> dict[str, str]:
         "TWILIO_MESSAGING_SID": "x" * 34,
     }
     # NOTE: enforces DELETE-ENV since apparently some session-based fixtures are settings these envs
-    for key in TWILO_CONFIG.keys():
+    for key in TWILO_CONFIG:
         monkeypatch.delenv(key, raising=False)
     return TWILO_CONFIG
 

services/web/server/tests/unit/isolated/test_projects__db_utils.py

@@ -5,9 +5,10 @@
 import datetime
 import json
 import re
+from collections.abc import Callable
 from copy import deepcopy
 from dataclasses import dataclass
-from typing import Any, Callable
+from typing import Any
 
 import pytest
 from faker import Faker
@@ -95,7 +96,7 @@ def test_convert_to_schema_names(fake_project: dict[str, Any]):
         assert col is not None
 
     # test date time conversion
-    date = datetime.datetime.now(datetime.timezone.utc)
+    date = datetime.datetime.now(datetime.UTC)
     db_entries["creation_date"] = date
     schema_entries = convert_to_schema_names(db_entries, fake_project["prjOwner"])
     assert "creationDate" in schema_entries
@@ -110,7 +111,7 @@ def test_convert_to_schema_names_camel_casing(fake_db_dict):
     assert "anEntryThatUsesSnakeCase" in db_entries
     assert "anotherEntryThatUsesSnakeCase" in db_entries
     # test date time conversion
-    date = datetime.datetime.now(datetime.timezone.utc)
+    date = datetime.datetime.now(datetime.UTC)
     fake_db_dict["time_entry"] = date
     db_entries = convert_to_schema_names(fake_db_dict, fake_email)
     assert "timeEntry" in db_entries

services/web/server/tests/unit/isolated/test_rest.py

@@ -48,10 +48,9 @@ async def slow_handler(request: web.Request):
 
     app.router.add_get("/slow", slow_handler)
 
-    cli = event_loop.run_until_complete(
+    return event_loop.run_until_complete(
         aiohttp_client(app, server_kwargs=server_kwargs)
     )
-    return cli
 
 
 async def test_frontend_config(

services/web/server/tests/unit/isolated/test_security__authz.py

@@ -97,10 +97,7 @@ def test_unique_permissions():
         for permission in can:
             assert (
                 permission not in used
-            ), "'{}' in {} is repeated in security_roles.ROLES_PERMISSIONS".format(
-                permission,
-                role,
-            )
+            ), f"'{permission}' in {role} is repeated in security_roles.ROLES_PERMISSIONS"
             used.append(permission)
 
 
@@ -263,7 +260,7 @@ async def _fake_db(engine, email):
             raise DatabaseError
 
         # inactive user or not found
-        return copy.deepcopy(users_db.get(email, None))
+        return copy.deepcopy(users_db.get(email))
 
     mock_db_fun = mocker.patch(
         "simcore_service_webserver.security._authz_policy.get_active_user_or_none",