Skip to content

[GRDM-63556] JupyterHubの更新に合わせてE2Eテストを修正 #56

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 2 commits into from
Oct 16, 2026
Merged

[GRDM-63556] JupyterHubの更新に合わせてE2Eテストを修正 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6114a39
Adapt E2E tests to the updated JupyterHub environment
yacchin1205 Oct 13, 2026
8a6856f
Wait for notebook saves before closing their tabs
yacchin1205 Oct 13, 2026
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
5 changes: 1 addition & 4 deletions .github/scripts/setup_tljh.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ case "$COMMAND" in
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
sudo chmod a+r /etc/apt/keyrings/nodesource.gpg

NODE_MAJOR=21
NODE_MAJOR=22
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | \
sudo tee /etc/apt/sources.list.d/nodesource.list
sudo apt-get update
Expand All @@ -51,9 +51,6 @@ case "$COMMAND" in
--admin admin:change-your-password \
--plugin "git+https://github.com/${TLJH_PLUGIN%%@*}.git@${TLJH_PLUGIN#*@}"

# Workaround: upgrade to the latest version of jupyterhub
sudo /opt/tljh/hub/bin/pip install --upgrade jupyterhub\<5

# Configure the plugin
cat <<'EOF' | sudo tee /opt/tljh/config/jupyterhub_config.d/repo2docker.py
from tljh_repo2docker import TLJH_R2D_ADMIN_SCOPE
Expand Down
37 changes: 19 additions & 18 deletions テスト手順-BinderHubアドオン-Dockerfile.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
"id": "7316011f",
"metadata": {},
"outputs": [],
"source": "import traceback\n\nenvironment_name = None\n\nasync def _step(page):\n global environment_name\n await page.locator('#username_input').fill(tljh_username)\n await page.locator('#password_input').fill(tljh_password)\n await page.locator('#login_submit').click()\n\n sync_icon = page.locator(f'//a[text()=\"{project_url}\"]/../..//*[@data-testid=\"SyncIcon\"]')\n try:\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await page.reload()\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n await sync_icon.click()\n\n env_locator = page.locator('//*[@data-testid=\"SyncIcon\"]/../../..//*[@data-field=\"display_name\"]//*[@role=\"presentation\"]')\n environment_name = await env_locator.text_content()\n print(environment_name)\n await asyncio.sleep(3)\n\nawait run_pw(_step)"
"source": "import traceback\n\nenvironment_name = None\n\nasync def _step(page):\n global environment_name\n await page.locator('#username_input').fill(tljh_username)\n await page.locator('#password_input').fill(tljh_password)\n await page.locator('#login_submit').click()\n\n log_button = page.locator(f'//a[text()=\"{project_url}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//button[.//*[@color=\"orange\"]]')\n try:\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await page.reload()\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n await log_button.click()\n\n env_locator = log_button.locator('xpath=ancestor::*[@role=\"row\"]//*[@data-field=\"display_name\"]')\n environment_name = await env_locator.text_content()\n print(environment_name)\n await asyncio.sleep(3)\n\nawait run_pw(_step)"
},
{
"cell_type": "markdown",
Expand All @@ -525,26 +525,26 @@
"\n",
"async def _step(page):\n",
" global environment_name\n",
" await page.locator('//*[contains(text(), \"Close\")]').click()\n",
" await page.get_by_role('button', name='Close', exact=True).click()\n",
" retry_count = 40\n",
" while retry_count > 0:\n",
" try:\n",
" check_icon = page.locator(f'//*[@title=\"{environment_name}\"]/../..//*[@data-testid=\"CheckIcon\"]')\n",
" await expect(check_icon).to_be_visible(timeout=transition_timeout)\n",
" build_complete = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//*[contains(@class, \"MuiSvgIcon-colorSuccess\")]')\n",
" await expect(build_complete).to_be_visible(timeout=transition_timeout)\n",
" break\n",
" except:\n",
" retry_count -= 1\n",
" if retry_count == 0:\n",
" traceback.print_exc()\n",
" await page.reload()\n",
"\n",
" target_check_icon = page.locator(f'//*[@title=\"{environment_name}\"]/../..//*[@data-testid=\"CheckIcon\"]')\n",
" target_build_complete = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//*[contains(@class, \"MuiSvgIcon-colorSuccess\")]')\n",
" try:\n",
" await expect(target_check_icon).to_be_visible(timeout=transition_timeout)\n",
" await expect(target_build_complete).to_be_visible(timeout=transition_timeout)\n",
" except:\n",
" try:\n",
" sync_icon = page.locator(f'//*[@title=\"{environment_name}\"]/../..//*[@data-testid=\"SyncIcon\"]')\n",
" await sync_icon.click()\n",
" log_button = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//button[.//*[@color=\"orange\"]]')\n",
" await log_button.click()\n",
" await asyncio.sleep(30)\n",
" except:\n",
" traceback.print_exc()\n",
Expand Down Expand Up @@ -597,7 +597,7 @@
"async def _step(page):\n",
" global environment_name\n",
" await page.locator('//button[contains(text(), \"Create new Server\")]').click()\n",
" checkbox = page.locator(f'//*[@title=\"{environment_name}\"]/../..//input[@type=\"checkbox\"]')\n",
" checkbox = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//input[@type=\"checkbox\"]')\n",
" await expect(checkbox).to_be_visible(timeout=transition_timeout)\n",
"\n",
"await run_pw(_step)"
Expand All @@ -619,7 +619,7 @@
"outputs": [],
"source": [
"async def _step(page):\n",
" await page.locator(f'//*[@title=\"{environment_name}\"]/../..//input[@type=\"checkbox\"]').click()\n",
" await page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//input[@type=\"checkbox\"]').click()\n",
" await page.locator('#server_name').fill('test-server')\n",
" await page.locator('//button[contains(text(), \"Create Server\")]').click()\n",
" await expect(page.locator('#server_name')).not_to_be_visible(timeout=transition_timeout * 5)\n",
Expand Down Expand Up @@ -796,6 +796,7 @@
" await expect(rename_dialog).to_be_visible(timeout=transition_timeout)\n",
" await rename_dialog.click()\n",
" await expect(rename_dialog).not_to_be_visible(timeout=transition_timeout)\n",
" await expect(page.locator('.lm-TabBar-tab.lm-mod-current.jp-mod-dirty')).to_have_count(0, timeout=transition_timeout)\n",
"\n",
" close_icon = page.locator('//*[contains(@class, \"lm-mod-current\")]//*[contains(@class, \"lm-TabBar-tabCloseIcon\")]')\n",
" await expect(close_icon).to_be_visible(timeout=transition_timeout)\n",
Expand Down Expand Up @@ -914,7 +915,7 @@
"execution_count": null,
"metadata": {},
"outputs": [],
"source": "nocopy_environment_name = None\n\nasync def _step(page):\n global nocopy_environment_name\n popup_future = page.wait_for_event('popup', timeout=transition_timeout)\n await page.locator('//*[@data-test-binderhub-launch]').click()\n popup = await popup_future\n\n sync_icon = popup.locator(f'//a[text()=\"{project_url}\"]/../..//*[@data-testid=\"SyncIcon\"]')\n try:\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await popup.reload()\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n await sync_icon.click()\n\n env_locator = popup.locator('//*[@data-testid=\"SyncIcon\"]/../../..//*[@data-field=\"display_name\"]//*[@role=\"presentation\"]')\n nocopy_environment_name = await env_locator.text_content()\n print(nocopy_environment_name)\n await asyncio.sleep(3)\n\n return popup\n\nawait run_pw(_step)"
"source": "nocopy_environment_name = None\n\nasync def _step(page):\n global nocopy_environment_name\n popup_future = page.wait_for_event('popup', timeout=transition_timeout)\n await page.locator('//*[@data-test-binderhub-launch]').click()\n popup = await popup_future\n\n log_button = popup.locator(f'//a[text()=\"{project_url}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//button[.//*[@color=\"orange\"]]')\n try:\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await popup.reload()\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n await log_button.click()\n\n env_locator = log_button.locator('xpath=ancestor::*[@role=\"row\"]//*[@data-field=\"display_name\"]')\n nocopy_environment_name = await env_locator.text_content()\n print(nocopy_environment_name)\n await asyncio.sleep(3)\n\n return popup\n\nawait run_pw(_step)"
},
{
"cell_type": "markdown",
Expand All @@ -930,12 +931,12 @@
"outputs": [],
"source": [
"async def _step(page):\n",
" await page.locator('//*[contains(text(), \"Close\")]').click()\n",
" await page.get_by_role('button', name='Close', exact=True).click()\n",
" retry_count = 40\n",
" while retry_count > 0:\n",
" try:\n",
" check_icon = page.locator(f'//*[@title=\"{nocopy_environment_name}\"]/../..//*[@data-testid=\"CheckIcon\"]')\n",
" await expect(check_icon).to_be_visible(timeout=transition_timeout)\n",
" build_complete = page.locator(f'//*[@title=\"{nocopy_environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//*[contains(@class, \"MuiSvgIcon-colorSuccess\")]')\n",
" await expect(build_complete).to_be_visible(timeout=transition_timeout)\n",
" break\n",
" except:\n",
" retry_count -= 1\n",
Expand Down Expand Up @@ -963,7 +964,7 @@
" await page.locator('//a[@href=\"/services/tljh_repo2docker/servers\"]').click()\n",
" await expect(page.locator('//button[contains(text(), \"Create new Server\")]')).to_be_visible(timeout=transition_timeout)\n",
" await page.locator('//button[contains(text(), \"Create new Server\")]').click()\n",
" checkbox = page.locator(f'//*[@title=\"{nocopy_environment_name}\"]/../..//input[@type=\"checkbox\"]')\n",
" checkbox = page.locator(f'//*[@title=\"{nocopy_environment_name}\"]/ancestor::*[@role=\"row\"]//input[@type=\"checkbox\"]')\n",
" await expect(checkbox).to_be_visible(timeout=transition_timeout)\n",
" await checkbox.click()\n",
" await page.locator('#server_name').fill('nocopy-server')\n",
Expand Down Expand Up @@ -1215,7 +1216,7 @@
"id": "292c0c98",
"metadata": {},
"outputs": [],
"source": "async def _step(page):\n popup_future = page.wait_for_event('popup', timeout=transition_timeout)\n await page.locator('//*[@data-test-binderhub-launch]').click()\n popup = await popup_future\n sync_icon = popup.locator('//*[@data-testid=\"SyncIcon\"]')\n try:\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await popup.reload()\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n return popup\n\nawait run_pw(_step)"
"source": "async def _step(page):\n popup_future = page.wait_for_event('popup', timeout=transition_timeout)\n await page.locator('//*[@data-test-binderhub-launch]').click()\n popup = await popup_future\n log_button = popup.locator('//*[@role=\"row\"]//*[@data-field=\"status\"]//button[.//*[@color=\"orange\"]]')\n try:\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await popup.reload()\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n return popup\n\nawait run_pw(_step)"
},
{
"cell_type": "markdown",
Expand All @@ -1231,7 +1232,7 @@
"id": "b5dd8d9b",
"metadata": {},
"outputs": [],
"source": "import traceback\n\nasync def _step(page):\n global environment_name\n\n sync_icon = page.locator(f'//a[text()=\"{project_url}\"]/../..//*[@data-testid=\"SyncIcon\"]')\n try:\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await page.reload()\n await expect(sync_icon).to_be_visible(timeout=transition_timeout)\n await sync_icon.click()\n await asyncio.sleep(3)\n\n env_locator = page.locator('//*[@data-testid=\"SyncIcon\"]/../../..//*[@data-field=\"display_name\"]//*[@role=\"presentation\"]')\n environment_name = await env_locator.text_content()\n print(environment_name)\n\n await page.locator('//*[contains(text(), \"Close\")]').click()\n\n retry_count = 40\n while retry_count > 0:\n try:\n check_icon = page.locator(f'//*[@title=\"{environment_name}\"]/../..//*[@data-testid=\"CheckIcon\"]')\n await expect(check_icon).to_be_visible(timeout=transition_timeout)\n break\n except:\n retry_count -= 1\n if retry_count == 0:\n traceback.print_exc()\n await page.reload()\n\n target_check_icon = page.locator(f'//*[@title=\"{environment_name}\"]/../..//*[@data-testid=\"CheckIcon\"]')\n try:\n await expect(target_check_icon).to_be_visible(timeout=transition_timeout)\n except:\n try:\n sync_icon = page.locator(f'//*[@title=\"{environment_name}\"]/../..//*[@data-testid=\"SyncIcon\"]')\n await sync_icon.click()\n await asyncio.sleep(30)\n except:\n traceback.print_exc()\n raise\n\nawait run_pw(_step)"
"source": "import traceback\n\nasync def _step(page):\n global environment_name\n\n log_button = page.locator(f'//a[text()=\"{project_url}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//button[.//*[@color=\"orange\"]]')\n try:\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n except:\n traceback.print_exc()\n await page.reload()\n await expect(log_button).to_be_visible(timeout=transition_timeout)\n await log_button.click()\n await asyncio.sleep(3)\n\n env_locator = log_button.locator('xpath=ancestor::*[@role=\"row\"]//*[@data-field=\"display_name\"]')\n environment_name = await env_locator.text_content()\n print(environment_name)\n\n await page.get_by_role('button', name='Close', exact=True).click()\n\n retry_count = 40\n while retry_count > 0:\n try:\n build_complete = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//*[contains(@class, \"MuiSvgIcon-colorSuccess\")]')\n await expect(build_complete).to_be_visible(timeout=transition_timeout)\n break\n except:\n retry_count -= 1\n if retry_count == 0:\n traceback.print_exc()\n await page.reload()\n\n target_build_complete = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//*[contains(@class, \"MuiSvgIcon-colorSuccess\")]')\n try:\n await expect(target_build_complete).to_be_visible(timeout=transition_timeout)\n except:\n try:\n log_button = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//*[@data-field=\"status\"]//button[.//*[@color=\"orange\"]]')\n await log_button.click()\n await asyncio.sleep(30)\n except:\n traceback.print_exc()\n raise\n\nawait run_pw(_step)"
},
{
"cell_type": "markdown",
Expand All @@ -1253,7 +1254,7 @@
" await page.locator('//a[@href=\"/services/tljh_repo2docker/servers\"]').click()\n",
" await expect(page.locator('//button[contains(text(), \"Create new Server\")]')).to_be_visible(timeout=transition_timeout)\n",
" await page.locator('//button[contains(text(), \"Create new Server\")]').click()\n",
" checkbox = page.locator(f'//*[@title=\"{environment_name}\"]/../..//input[@type=\"checkbox\"]')\n",
" checkbox = page.locator(f'//*[@title=\"{environment_name}\"]/ancestor::*[@role=\"row\"]//input[@type=\"checkbox\"]')\n",
" await expect(checkbox).to_be_visible(timeout=transition_timeout)\n",
" await checkbox.click()\n",
" await page.locator('#server_name').fill('dockerfile-server')\n",
Expand Down
Loading
Loading