Some tests fixup

Adds timeout to wait for updating ostree repo.

Cleanup test now actually cleans something up.

test/check-ostree

@@ -278,7 +278,8 @@ class OstreeRestartCase(testlib.MachineCase):
  stop_trivial_httpd(m, server_pid)
  wait_deployment_prop(b, 1, "Status", "New")
  do_deployment_action(b, 1, "Update")
- wait_deployment_prop(b, 1, "Status", "Failedview more...New")
+ with b.wait_timeout(60):
+ wait_deployment_prop(b, 1, "Status", "Failedview more...New")
  server_pid = start_trivial_httpd(m)
 
  # Apply update
@@ -494,7 +495,6 @@ class OstreeRestartCase(testlib.MachineCase):
 
  remove_pkg = m.execute("rpm -qa | grep socat").strip()
 
- rhsmcertd_hack(m)
  m.start_cockpit()
  b.login_and_go("/updates")
  b.enter_page("/updates")
@@ -549,6 +549,7 @@ class OstreeRestartCase(testlib.MachineCase):
  b.reload()
  b.login_and_go("/updates")
  wait_not_packages(b, 1, [OVERLAY_RPM])
+ b.click("#available-deployments > tbody:nth-child(2) .pf-v5-c-table__toggle button")
 
  # Generate new commit
  generate_new_commit(m, remove_pkg)
@@ -563,46 +564,27 @@ class OstreeRestartCase(testlib.MachineCase):
  wait_deployment_prop(b, 1, "Status", "New")
  wait_deployment_prop(b, 1, "Actions", "Update")
 
- # Pin current deployment
- do_deployment_action(b, 2, "Pin")
- wait_deployment_prop(b, 2, "Status", "Pinned")
+ # Pin rollback deployment
+ do_deployment_action(b, 3, "Pin")
+ wait_deployment_prop(b, 3, "Status", "Pinned")
  # Kebab menu is not available for update
  b.wait_not_present("""#available-deployments > tbody:nth-child(2) tr:nth-child(1)
  td:last-child button.pf-v5-c-dropdown__toggle""")
 
- # Update
- do_deployment_action(b, 1, "Update")
- wait_deployment_prop(b, 1, "Status", "Updating")
-
- b.switch_to_top()
- with b.wait_timeout(120):
- b.wait_visible(".curtains-ct")
-
- b.wait_in_text(".curtains-ct h1", "Disconnected")
- m.wait_reboot()
- m.start_cockpit()
- b.reload()
- b.login_and_go("/updates")
-
- # Update is successful
- b.wait_in_text("#ostree-status li:first-child > div > div:last-child", "System is up to date")
- wait_deployment_prop(b, 1, "Version", "cockpit-base.2")
- wait_deployment_prop(b, 1, "Status", "Current")
- wait_deployment_prop(b, 1, "Actions", "")
-
- # Use clean up with 'remove rollback deployments'
+ # Use clean up to remove pending and rollback deployments
  do_card_action(b, "#deployments-actions", "Clean up")
  b.wait_visible("#cleanup-deployment-modal")
- b.click("#temporary-files-checkbox")
- b.click("#rpm-repo-metadata-checkbox")
+ b.click("#pending-deployment-checkbox")
  b.click("#rollback-deployment-checkbox")
  b.click("#cleanup-deployment-modal button.pf-m-primary")
  b.wait_not_present("#cleanup-deployment-modal")
 
- # One deployment was deleted
+ # Rollback deployment wasn't deleted because it's pinned
  b.call_js_func("ph_count_check", "#available-deployments tbody tr", 2)
 
  # Manually delete base.1 deployment
+ do_deployment_action(b, 2, "Unpin")
+ b.wait_not_present("#available-deployments .pf-v5-c-dropdown__menu")
  wait_deployment_prop(b, 2, "Version", "cockpit-base.1")
  wait_deployment_prop(b, 2, "Status", "")
  wait_deployment_prop(b, 2, "Actions", "Roll back")