From 0fef32e4d3af2354386a648e661abada8e3a405d Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Wed, 10 Jul 2024 17:32:44 -0700 Subject: [PATCH 1/5] Update to dummy emails --- libs/labelbox/tests/integration/test_user_management.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/labelbox/tests/integration/test_user_management.py b/libs/labelbox/tests/integration/test_user_management.py index 66f0fb659..25d38a112 100644 --- a/libs/labelbox/tests/integration/test_user_management.py +++ b/libs/labelbox/tests/integration/test_user_management.py @@ -1,10 +1,13 @@ -from labelbox import ProjectRole import pytest +from labelbox import ProjectRole +from faker import Faker + +faker = Faker() def test_org_invite(client, organization, environ, queries): role = client.get_roles()['LABELER'] - dummy_email = "none@labelbox.com" + dummy_email = faker.email() invite_limit = organization.invite_limit() if environ.value == "prod": @@ -39,7 +42,7 @@ def test_org_invite(client, organization, environ, queries): def test_project_invite(client, organization, project_pack, queries): project_1, project_2 = project_pack roles = client.get_roles() - dummy_email = "none1@labelbox.com" + dummy_email = faker.email() project_role_1 = ProjectRole(project=project_1, role=roles['LABELER']) project_role_2 = ProjectRole(project=project_2, role=roles['REVIEWER']) invite = organization.invite_user( From bc59c8867fb702f16eb40c52f69365a7ab547f16 Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Wed, 10 Jul 2024 17:42:25 -0700 Subject: [PATCH 2/5] use labelbox domain --- libs/labelbox/tests/integration/test_user_management.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/tests/integration/test_user_management.py b/libs/labelbox/tests/integration/test_user_management.py index 25d38a112..7073ffaee 100644 --- a/libs/labelbox/tests/integration/test_user_management.py +++ b/libs/labelbox/tests/integration/test_user_management.py @@ -7,7 +7,7 @@ def test_org_invite(client, organization, environ, queries): role = client.get_roles()['LABELER'] - dummy_email = faker.email() + dummy_email = "none+{}@labelbox.com".format(faker.word()) invite_limit = organization.invite_limit() if environ.value == "prod": @@ -42,7 +42,7 @@ def test_org_invite(client, organization, environ, queries): def test_project_invite(client, organization, project_pack, queries): project_1, project_2 = project_pack roles = client.get_roles() - dummy_email = faker.email() + dummy_email = "none+{}@labelbox.com".format(faker.word()) project_role_1 = ProjectRole(project=project_1, role=roles['LABELER']) project_role_2 = ProjectRole(project=project_2, role=roles['REVIEWER']) invite = organization.invite_user( From c430dafbba340cb152ff8ef633aeb13725b2ea2f Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Wed, 10 Jul 2024 17:48:20 -0700 Subject: [PATCH 3/5] random_letters --- libs/labelbox/tests/integration/test_user_management.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/tests/integration/test_user_management.py b/libs/labelbox/tests/integration/test_user_management.py index 7073ffaee..db2f87fe1 100644 --- a/libs/labelbox/tests/integration/test_user_management.py +++ b/libs/labelbox/tests/integration/test_user_management.py @@ -7,7 +7,7 @@ def test_org_invite(client, organization, environ, queries): role = client.get_roles()['LABELER'] - dummy_email = "none+{}@labelbox.com".format(faker.word()) + dummy_email = "none+{}@labelbox.com".format(faker.random_letters(26)) invite_limit = organization.invite_limit() if environ.value == "prod": @@ -42,7 +42,7 @@ def test_org_invite(client, organization, environ, queries): def test_project_invite(client, organization, project_pack, queries): project_1, project_2 = project_pack roles = client.get_roles() - dummy_email = "none+{}@labelbox.com".format(faker.word()) + dummy_email = "none+{}@labelbox.com".format(faker.random_letters(26)) project_role_1 = ProjectRole(project=project_1, role=roles['LABELER']) project_role_2 = ProjectRole(project=project_2, role=roles['REVIEWER']) invite = organization.invite_user( From 803a6e67b05a047dc1924d3482fb02b07c28d6e7 Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Wed, 10 Jul 2024 17:52:10 -0700 Subject: [PATCH 4/5] Fix tests --- libs/labelbox/tests/integration/schema/test_user_group.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/labelbox/tests/integration/schema/test_user_group.py b/libs/labelbox/tests/integration/schema/test_user_group.py index e8464ac37..3cd708465 100644 --- a/libs/labelbox/tests/integration/schema/test_user_group.py +++ b/libs/labelbox/tests/integration/schema/test_user_group.py @@ -158,9 +158,9 @@ def test_get_user_groups_with_creation_deletion(client): assert len(user_groups_post_creation) == len(user_groups) + 1 # Verify that each user group has a valid ID and name - for user_group in user_groups_post_creation: - assert user_group.id is not None - assert user_group.name is not None + for ug in user_groups_post_creation: + assert ug.id is not None + assert ug.name is not None user_group.delete() user_group = None From 20757d5d8232a059d9ab4eb0469646241b201cf1 Mon Sep 17 00:00:00 2001 From: Adrian Chang Date: Wed, 10 Jul 2024 17:57:22 -0700 Subject: [PATCH 5/5] Random emails --- libs/labelbox/tests/integration/test_user_management.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/tests/integration/test_user_management.py b/libs/labelbox/tests/integration/test_user_management.py index db2f87fe1..2061e669e 100644 --- a/libs/labelbox/tests/integration/test_user_management.py +++ b/libs/labelbox/tests/integration/test_user_management.py @@ -7,7 +7,7 @@ def test_org_invite(client, organization, environ, queries): role = client.get_roles()['LABELER'] - dummy_email = "none+{}@labelbox.com".format(faker.random_letters(26)) + dummy_email = "none+{}@labelbox.com".format("".join(faker.random_letters(26))) invite_limit = organization.invite_limit() if environ.value == "prod": @@ -42,7 +42,7 @@ def test_org_invite(client, organization, environ, queries): def test_project_invite(client, organization, project_pack, queries): project_1, project_2 = project_pack roles = client.get_roles() - dummy_email = "none+{}@labelbox.com".format(faker.random_letters(26)) + dummy_email = "none+{}@labelbox.com".format("".join(faker.random_letters(26))) project_role_1 = ProjectRole(project=project_1, role=roles['LABELER']) project_role_2 = ProjectRole(project=project_2, role=roles['REVIEWER']) invite = organization.invite_user(