Skip to content

Commit 242fb36

Browse files
chore(modelarmor): mark skip for floor settings tests (#13424)
* chore(modelarmor): Marked skip for floor settings tests instead of commenting it out * chore(modelarmor): Added buganizer ticket id for status reference. * chore(modelarmor): refactored skip reason
1 parent 6618381 commit 242fb36

File tree

1 file changed

+45
-39
lines changed

1 file changed

+45
-39
lines changed

model_armor/snippets/snippets_test.py

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
create_model_armor_template_with_metadata,
3636
)
3737
from delete_template import delete_model_armor_template
38-
# from get_folder_floor_settings import get_folder_floor_settings
39-
# from get_organization_floor_settings import get_organization_floor_settings
40-
# from get_project_floor_settings import get_project_floor_settings
38+
39+
from get_folder_floor_settings import get_folder_floor_settings
40+
from get_organization_floor_settings import get_organization_floor_settings
41+
from get_project_floor_settings import get_project_floor_settings
4142
from get_template import get_model_armor_template
4243
from list_templates import list_model_armor_templates
4344
from list_templates_with_filter import list_model_armor_templates_with_filter
@@ -48,11 +49,12 @@
4849
)
4950
from sanitize_user_prompt import sanitize_user_prompt
5051
from screen_pdf_file import screen_pdf_file
51-
# from update_folder_floor_settings import update_folder_floor_settings
52-
# from update_organizations_floor_settings import (
53-
# update_organization_floor_settings,
54-
# )
55-
# from update_project_floor_settings import update_project_floor_settings
52+
53+
from update_folder_floor_settings import update_folder_floor_settings
54+
from update_organizations_floor_settings import (
55+
update_organization_floor_settings,
56+
)
57+
from update_project_floor_settings import update_project_floor_settings
5658
from update_template import update_model_armor_template
5759
from update_template_labels import update_model_armor_template_labels
5860
from update_template_metadata import update_model_armor_template_metadata
@@ -1166,50 +1168,54 @@ def test_quickstart(
11661168
quickstart(project_id, location_id, template_id)
11671169

11681170

1169-
# TODO: Uncomment below tests once floor setting API issues are resolved.
1170-
1171-
# def test_update_organization_floor_settings(
1172-
# floor_setting_organization_id: str,
1173-
# ) -> None:
1174-
# response = update_organization_floor_settings(floor_setting_organization_id)
1171+
@pytest.mark.skip(reason="Remove skip once the b/424365799 is resolved")
1172+
def test_update_organization_floor_settings(
1173+
floor_setting_organization_id: str,
1174+
) -> None:
1175+
response = update_organization_floor_settings(floor_setting_organization_id)
11751176

1176-
# assert response.enable_floor_setting_enforcement
1177+
assert response.enable_floor_setting_enforcement
11771178

11781179

1179-
# def test_update_folder_floor_settings(floor_setting_folder_id: str) -> None:
1180-
# response = update_folder_floor_settings(floor_setting_folder_id)
1180+
@pytest.mark.skip(reason="Remove skip once the b/424365799 is resolved")
1181+
def test_update_folder_floor_settings(floor_setting_folder_id: str) -> None:
1182+
response = update_folder_floor_settings(floor_setting_folder_id)
11811183

1182-
# assert response.enable_floor_setting_enforcement
1184+
assert response.enable_floor_setting_enforcement
11831185

11841186

1185-
# def test_update_project_floor_settings(floor_settings_project_id: str) -> None:
1186-
# response = update_project_floor_settings(floor_settings_project_id)
1187+
@pytest.mark.skip(reason="Remove skip once the b/424365799 is resolved")
1188+
def test_update_project_floor_settings(floor_settings_project_id: str) -> None:
1189+
response = update_project_floor_settings(floor_settings_project_id)
11871190

1188-
# assert response.enable_floor_setting_enforcement
1191+
assert response.enable_floor_setting_enforcement
11891192

11901193

1191-
# def test_get_organization_floor_settings(organization_id: str) -> None:
1192-
# expected_floor_settings_name = (
1193-
# f"organizations/{organization_id}/locations/global/floorSetting"
1194-
# )
1195-
# response = get_organization_floor_settings(organization_id)
1194+
@pytest.mark.skip(reason="Remove skip once the b/424365799 is resolved")
1195+
def test_get_organization_floor_settings(organization_id: str) -> None:
1196+
expected_floor_settings_name = (
1197+
f"organizations/{organization_id}/locations/global/floorSetting"
1198+
)
1199+
response = get_organization_floor_settings(organization_id)
11961200

1197-
# assert response.name == expected_floor_settings_name
1201+
assert response.name == expected_floor_settings_name
11981202

11991203

1200-
# def test_get_folder_floor_settings(folder_id: str) -> None:
1201-
# expected_floor_settings_name = (
1202-
# f"folders/{folder_id}/locations/global/floorSetting"
1203-
# )
1204-
# response = get_folder_floor_settings(folder_id)
1204+
@pytest.mark.skip(reason="Remove skip once the b/424365799 is resolved")
1205+
def test_get_folder_floor_settings(folder_id: str) -> None:
1206+
expected_floor_settings_name = (
1207+
f"folders/{folder_id}/locations/global/floorSetting"
1208+
)
1209+
response = get_folder_floor_settings(folder_id)
12051210

1206-
# assert response.name == expected_floor_settings_name
1211+
assert response.name == expected_floor_settings_name
12071212

12081213

1209-
# def test_get_project_floor_settings(project_id: str) -> None:
1210-
# expected_floor_settings_name = (
1211-
# f"projects/{project_id}/locations/global/floorSetting"
1212-
# )
1213-
# response = get_project_floor_settings(project_id)
1214+
@pytest.mark.skip(reason="Remove skip once the b/424365799 is resolved")
1215+
def test_get_project_floor_settings(project_id: str) -> None:
1216+
expected_floor_settings_name = (
1217+
f"projects/{project_id}/locations/global/floorSetting"
1218+
)
1219+
response = get_project_floor_settings(project_id)
12141220

1215-
# assert response.name == expected_floor_settings_name
1221+
assert response.name == expected_floor_settings_name

0 commit comments

Comments
 (0)