fixes user_role enum

Author: pcrespov

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

@@ -4,8 +4,6 @@
 from pathlib import Path
 
 import pytest
-import simcore_service_webserver
-import simcore_service_webserver.security
 from faker import Faker
 from pytest_mock import MockerFixture, MockType
 from pytest_simcore.helpers.monkeypatch_envs import (
@@ -21,7 +19,7 @@ def dir_with_random_content(tmpdir, faker: Faker) -> Path:
     def make_files_in_dir(dir_path: Path, file_count: int) -> None:
         for _ in range(file_count):
             (dir_path / f"{faker.file_name(extension='bin')}").write_bytes(
-                os.urandom(random.randint(1, 10))
+                os.urandom(random.randint(1, 10))  # noqa: S311
             )
 
     def ensure_dir(path_to_ensure: Path) -> Path:
@@ -32,13 +30,13 @@ def make_subdirectory_with_content(subdir_name: Path, max_file_count: int) -> No
         subdir_name = ensure_dir(subdir_name)
         make_files_in_dir(
             dir_path=subdir_name,
-            file_count=random.randint(1, max_file_count),
+            file_count=random.randint(1, max_file_count),  # noqa: S311
         )
 
     def make_subdirectories_with_content(
         subdir_name: Path, max_subdirectories_count: int, max_file_count: int
     ) -> None:
-        subdirectories_count = random.randint(1, max_subdirectories_count)
+        subdirectories_count = random.randint(1, max_subdirectories_count)  # noqa: S311
         for _ in range(subdirectories_count):
             make_subdirectory_with_content(
                 subdir_name=subdir_name / f"{faker.word()}",

services/web/server/tests/unit/with_dbs/01/groups/test_groups_handlers_crud.py

@@ -59,7 +59,7 @@ async def test_list_user_groups_and_try_modify_organizations(
 ):
     assert client.app
     assert logged_user["id"] != standard_groups_owner["id"]
-    assert logged_user["role"] == user_role.value
+    assert logged_user["role"] == user_role
 
     # List all groups (organizations, primary, everyone and products) I belong to
     url = client.app.router["list_groups"].url_for()
@@ -130,7 +130,7 @@ async def test_group_creation_workflow(
 ):
     assert client.app
     assert logged_user["id"] != 0
-    assert logged_user["role"] == user_role.value
+    assert logged_user["role"] == user_role
 
     url = client.app.router["create_group"].url_for()
     new_group_data = {

services/web/server/tests/unit/with_dbs/01/groups/test_groups_handlers_users.py

@@ -552,7 +552,7 @@ async def test_create_organization_and_add_users(
 ):
     assert client.app
     assert logged_user["id"] != 0
-    assert logged_user["role"] == user_role.value
+    assert logged_user["role"] == user_role
 
     # CREATE GROUP
     url = client.app.router["create_group"].url_for()

services/web/server/tests/unit/with_dbs/02/test_projects_groups_handlers.py

@@ -311,7 +311,7 @@ async def test_share_project_with_roles(
 ):
     assert client.app
 
-    assert logged_user["role"] == user_role.value
+    assert logged_user["role"] == user_role
 
     # Attempt to share the project
     url = client.app.router["share_project"].url_for(

services/web/server/tests/unit/with_dbs/04/products/test_products_rest.py

@@ -135,7 +135,7 @@ async def test_get_current_product_ui(
     user_role: UserRole,
     expected_status_code: int,
 ):
-    assert logged_user["role"] == user_role.value
+    assert logged_user["role"] == user_role
     assert product_name in app_products_names
 
     # give access to user to this product