Skip to content

機関ストレージ (S3CompatSigV4) のファイルプロパティ期待値を修正 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yacchin1205 merged 1 commit into from
Apr 18, 2026
Merged

機関ストレージ (S3CompatSigV4) のファイルプロパティ期待値を修正 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 34 additions & 59 deletions scripts/grdm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,54 +406,44 @@ async def enable_addon(page, addon_name, transition_timeout=10000):
else:
print('Addon already enabled')

async def display_property_file_info(page, provider, filesize, filepath):
async def _expect_empty_or_not(locator, expected):
if expected == 'nonempty':
await expect(locator).not_to_be_empty()
elif expected == 'empty':
await expect(locator).to_be_empty()
else:
raise ValueError(f'expected must be "empty" or "nonempty", got {expected!r}')

async def verify_property_file_info(
page, filesize, filepath, *,
expected_createtime, expected_updatetime, expected_updateby,
):
locator_size = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "サイズ: "]/following-sibling::span')
locator_createtime = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "作成日時: "]/following-sibling::span')
locator_updatetime = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "更新日時: "]/following-sibling::span')
locator_updateby = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "最終更新者: "]/following-sibling::span')
locator_path = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "パス: "]/following-sibling::span')

# サイズ

await locator_size.scroll_into_view_if_needed()
await expect(locator_size).to_have_text(filesize)
time.sleep(1)
if provider == 'NII Storage':
# 作成日時
await locator_createtime.scroll_into_view_if_needed()
await expect(locator_createtime).not_to_be_empty()
# 更新日時
await locator_updatetime.scroll_into_view_if_needed()
await expect(locator_updatetime).not_to_be_empty()
# 最終更新者
await locator_updateby.scroll_into_view_if_needed()
await expect(locator_updateby).not_to_be_empty()
elif provider in ['Google Drive', 'OneDrive']:
# 作成日時
await locator_createtime.scroll_into_view_if_needed()
await expect(locator_createtime).not_to_be_empty()
# 更新日時
await locator_updatetime.scroll_into_view_if_needed()
await expect(locator_updatetime).not_to_be_empty()
# 最終更新者
await locator_updateby.scroll_into_view_if_needed()
await expect(locator_updateby).to_be_empty()
else:
# 作成日時
await locator_createtime.scroll_into_view_if_needed()
await expect(locator_createtime).to_be_empty()
# 更新日時
await locator_updatetime.scroll_into_view_if_needed()
await expect(locator_updatetime).not_to_be_empty()
# 最終更新者
await locator_updateby.scroll_into_view_if_needed()
await expect(locator_updateby).to_be_empty()
# パス

await locator_createtime.scroll_into_view_if_needed()
await _expect_empty_or_not(locator_createtime, expected_createtime)
await locator_updatetime.scroll_into_view_if_needed()
await _expect_empty_or_not(locator_updatetime, expected_updatetime)
await locator_updateby.scroll_into_view_if_needed()
await _expect_empty_or_not(locator_updateby, expected_updateby)

await locator_path.scroll_into_view_if_needed()
await expect(locator_path).to_have_text(filepath)

time.sleep(1)

async def display_property_folder_info(page, provider, filenumber, foldersize, folderpath):
async def verify_property_folder_info(
page, filenumber, foldersize, folderpath, *,
expected_createtime, expected_updatetime, expected_updateby,
):
await expect(page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "読み込み中..."]')).not_to_be_visible(timeout=60000)
time.sleep(2)

Expand All @@ -463,35 +453,20 @@ async def display_property_folder_info(page, provider, filenumber, foldersize, f
locator_updatetime = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "更新日時: "]/following-sibling::span')
locator_updateby = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "最終更新者: "]/following-sibling::span')
locator_path = page.locator('//*[@id = "tb-tbody"]//*[@class = "modal-content"]//*[text() = "パス: "]/following-sibling::span')

# 合計ファイル数

await locator_filenumber.scroll_into_view_if_needed()
await expect(locator_filenumber).to_have_text(filenumber)
# 合計サイズ
await locator_size.scroll_into_view_if_needed()
await expect(locator_size).to_have_text(foldersize)
time.sleep(1)
if provider == 'NII Storage':
# 作成日時
await locator_createtime.scroll_into_view_if_needed()
await expect(locator_createtime).not_to_be_empty()
# 更新日時
await locator_updatetime.scroll_into_view_if_needed()
await expect(locator_updatetime).not_to_be_empty()
# 最終更新者
await locator_updateby.scroll_into_view_if_needed()
await expect(locator_updateby).to_be_empty()
else:
# 作成日時
await locator_createtime.scroll_into_view_if_needed()
await expect(locator_createtime).to_be_empty()
# 更新日時
await locator_updatetime.scroll_into_view_if_needed()
await expect(locator_updatetime).to_be_empty()
# 最終更新者
await locator_updateby.scroll_into_view_if_needed()
await expect(locator_updateby).to_be_empty()
# パス

await locator_createtime.scroll_into_view_if_needed()
await _expect_empty_or_not(locator_createtime, expected_createtime)
await locator_updatetime.scroll_into_view_if_needed()
await _expect_empty_or_not(locator_updatetime, expected_updatetime)
await locator_updateby.scroll_into_view_if_needed()
await _expect_empty_or_not(locator_updateby, expected_updateby)

await locator_path.scroll_into_view_if_needed()
await expect(locator_path).to_have_text(folderpath)

Expand Down
605 changes: 225 additions & 380 deletions テスト手順-ストレージ共通-ファイル基本操作.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 28 additions & 3 deletions テスト手順-管理者機能-S3CompatSigV4-機関ストレージ.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,19 @@
"id": "c147c50c-7dc4-4be7-8fbb-d98197761f23",
"metadata": {},
"outputs": [],
"source": "result_notebooks.append(run_notebook(\n 'テスト手順-ストレージ共通-ファイル基本操作.ipynb',\n dict(\n enable_52gb_file_upload=False,\n target_storage_name=institutional_storage_name,\n target_file_view='project-dashboard',\n rdm_project_name=f'{rdm_project_prefix}-dashboard',\n ),\n))\nresult_notebooks"
"source": [
"result_notebooks.append(run_notebook(\n",
" 'テスト手順-ストレージ共通-ファイル基本操作.ipynb',\n",
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=institutional_storage_name,\n",
" target_storage_id='osfstorage',\n",
" target_file_view='project-dashboard',\n",
" rdm_project_name=f'{rdm_project_prefix}-dashboard',\n",
" ),\n",
"))\n",
"result_notebooks"
]
},
{
"cell_type": "code",
Expand All @@ -737,7 +749,20 @@
"id": "ce8d4388-67ab-45de-9a56-fa875222b292",
"metadata": {},
"outputs": [],
"source": "result_notebooks.append(run_notebook(\n 'テスト手順-ストレージ共通-ファイル基本操作.ipynb',\n dict(\n enable_52gb_file_upload=False,\n target_storage_name=institutional_storage_name,\n target_file_view='file-tab',\n rdm_project_name=f'{rdm_project_prefix}-filetab',\n ),\n '-file-tab',\n))\nresult_notebooks"
"source": [
"result_notebooks.append(run_notebook(\n",
" 'テスト手順-ストレージ共通-ファイル基本操作.ipynb',\n",
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=institutional_storage_name,\n",
" target_storage_id='osfstorage',\n",
" target_file_view='file-tab',\n",
" rdm_project_name=f'{rdm_project_prefix}-filetab',\n",
" ),\n",
" '-file-tab',\n",
"))\n",
"result_notebooks"
]
},
{
"cell_type": "markdown",
Expand Down Expand Up @@ -805,4 +830,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 3 additions & 1 deletion 取りまとめ-NIIストレージ.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,7 @@
" dict(\n",
" too_large_file_upload_size=too_large_file_upload_size,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='project-dashboard',\n",
" rdm_project_name=f'{rdm_project_prefix}-dashboard',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -1009,6 +1010,7 @@
" dict(\n",
" too_large_file_upload_size=too_large_file_upload_size,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='file-tab',\n",
" rdm_project_name=f'{rdm_project_prefix}-filetab',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -1542,4 +1544,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 3 additions & 1 deletion 取りまとめ-S3CompatSigV4.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,6 +1247,7 @@
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='project-dashboard',\n",
" rdm_project_name=f'{rdm_project_prefix}-dashboard',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -1849,6 +1850,7 @@
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='file-tab',\n",
" rdm_project_name=f'{rdm_project_prefix}-filetab',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -5010,4 +5012,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 3 additions & 1 deletion 取りまとめ-S3共通.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4215,6 +4215,7 @@
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='project-dashboard',\n",
" rdm_project_name=f'{rdm_project_prefix}-dashboard',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -5833,6 +5834,7 @@
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='file-tab',\n",
" rdm_project_name=f'{rdm_project_prefix}-filetab',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -12277,4 +12279,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
4 changes: 3 additions & 1 deletion 取りまとめ-拡張ストレージ-共通試験.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,7 @@
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='project-dashboard',\n",
" rdm_project_name=f'{rdm_project_prefix}-dashboard',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -1048,6 +1049,7 @@
" dict(\n",
" enable_52gb_file_upload=False,\n",
" target_storage_name=target_storage_name,\n",
" target_storage_id=target_storage_id,\n",
" target_file_view='file-tab',\n",
" rdm_project_name=f'{rdm_project_prefix}-filetab',\n",
" enable_1gb_file_upload=enable_1gb_file_upload,\n",
Expand Down Expand Up @@ -3338,4 +3340,4 @@
},
"nbformat": 4,
"nbformat_minor": 5
}
}
Loading