diff options
Diffstat (limited to 'tests/unit/auth/test_resources.py')
| -rw-r--r-- | tests/unit/auth/test_resources.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/tests/unit/auth/test_resources.py b/tests/unit/auth/test_resources.py index 2884add..7b9798a 100644 --- a/tests/unit/auth/test_resources.py +++ b/tests/unit/auth/test_resources.py @@ -21,7 +21,12 @@ create_resource_failure = { "status": "error", "message": "Unauthorised: Could not create resource" } -uuid_fn = lambda : uuid.UUID("d32611e3-07fc-4564-b56c-786c6db6de2b") + + +def uuid_fn(): + """Mock function for uuid""" + return uuid.UUID("d32611e3-07fc-4564-b56c-786c6db6de2b") + @pytest.mark.unit_test @pytest.mark.parametrize( @@ -71,7 +76,6 @@ def test_create_resource_raises_for_unauthorised_users( assert create_resource( conn, "test_resource", resource_category, user, False) == expected -SORTKEY = lambda resource: resource.resource_id @pytest.mark.unit_test def test_public_resources(fxtr_resources): @@ -81,12 +85,16 @@ def test_public_resources(fxtr_resources): THEN: only list the resources that are public """ conn, _res = fxtr_resources - assert sorted(public_resources(conn), key=SORTKEY) == sorted(tuple( - res for res in conftest.TEST_RESOURCES if res.public), key=SORTKEY) + assert sorted( + public_resources(conn), + key=lambda resource: resource.resource_id) == sorted(tuple( + res for res in + conftest.TEST_RESOURCES + if res.public), key=lambda resource: resource.resource_id) PUBLIC_RESOURCES = sorted( {res.resource_id: res for res in conftest.TEST_RESOURCES_PUBLIC}.values(), - key=SORTKEY) + key=lambda resource: resource.resource_id) @pytest.mark.unit_test @pytest.mark.parametrize( @@ -97,13 +105,12 @@ PUBLIC_RESOURCES = sorted( {res.resource_id: res for res in (conftest.TEST_RESOURCES_GROUP_01 + conftest.TEST_RESOURCES_PUBLIC)}.values(), - key=SORTKEY), + key=lambda resource: resource.resource_id), sorted( {res.resource_id: res for res in ((conftest.TEST_RESOURCES_GROUP_01[1],) + conftest.TEST_RESOURCES_PUBLIC)}.values() - , - key=SORTKEY), + , key=lambda resource: resource.resource_id), PUBLIC_RESOURCES, PUBLIC_RESOURCES)))) def test_user_resources(fxtr_group_user_roles, user, expected): """ @@ -114,4 +121,4 @@ def test_user_resources(fxtr_group_user_roles, user, expected): conn, *_others = fxtr_group_user_roles assert sorted( {res.resource_id: res for res in user_resources(conn, user) - }.values(), key=SORTKEY) == expected + }.values(), key=lambda resource: resource.resource_id) == expected |