Skip to content
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.

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

Makefile: Update Cockpit lib to 035dc2d9be846320bbe4b2be75c32277 #1914

Merged
merged 2 commits into from
Nov 26, 2024

Conversation

github-actions[bot]
Copy link
Contributor

Aditya Vardhan Singh (1):
shell: style login close button as secondary button

Jelle van der Waa (4):
lib: cockpit: remove cockpit.resolve/cockpit.reject()
lib: cockpit: remove cockpit.when()
lib: cockpit: make resolve_dot_paths always return an array
pkg: lib: robustify self.path initialisation for cockpit.location

Marius Vollmer (1):
shell: Require confirmation before connecting to remote machines

Martin Pitt (5):
lib: Ignore invalid input keys in Terminal
test: Add support for querying shadow DOM
lib: Eliminate ModificationsExportDialog show property
lib: Make cockpit-components-modifications Ansible optional
test: Avoid scrolling race with session menu

@github-actions github-actions bot added the bot label Nov 21, 2024
@github-actions github-actions bot changed the title [no-test] Makefile: Update Cockpit lib to 035dc2d9be846320bbe4b2be75c32277 Makefile: Update Cockpit lib to 035dc2d9be846320bbe4b2be75c32277 Nov 21, 2024
@allisonkarlitskaya allisonkarlitskaya force-pushed the cockpit-lib-update-cockpit-lib-20241121-025039 branch from 965f594 to 8e4f429 Compare November 21, 2024 02:50
@martinpitt
Copy link
Member

Hmm, I would have thought the multihost warning dialogs only affect the shell, not pkg/lib, but that test is broken very consistently.

@martinpitt
Copy link
Member

Wait, didn't I just fix that in #1915 ? Let's try and rebase.

@martinpitt martinpitt force-pushed the cockpit-lib-update-cockpit-lib-20241121-025039 branch from 8e4f429 to 85d7a18 Compare November 25, 2024 07:19
@martinpitt martinpitt assigned martinpitt and unassigned martinpitt Nov 25, 2024
@martinpitt
Copy link
Member

Nope, didn't help, still failing.

@jelly
Copy link
Member

jelly commented Nov 25, 2024

The tests fail because testlib was updated to handle the new refactored host switcher logic in f06b13a4c4 but that only works for Cockpit 329. Our images still have Cockpit 327 which means we have to pass the option which enables the old behaviour.

We should have added this check in testlib honestly.

@jelly jelly requested a review from martinpitt November 25, 2024 16:46
@jelly
Copy link
Member

jelly commented Nov 25, 2024

Looks like it going green \o/

@martinpitt
Copy link
Member

https://cockpit-logs.us-east-1.linodeobjects.com/pull-1914-a6bf6b4c-20241125-162813-opensuse-tumbleweed/log.html#91 still fails on that problem 😢 the other two look like flakes, retrying.

With the release of Cockpit 329 the add host dialog now warns the user
before adding a remote host. Cockpit's testlib add host helper function
defaults to this behaviour but our test images still have an older
version of Cockpit installed.
@jelly jelly force-pushed the cockpit-lib-update-cockpit-lib-20241121-025039 branch from a6bf6b4 to 9ff3738 Compare November 26, 2024 10:49
@martinpitt
Copy link
Member

this failure is annoying:

testlib.Error: ReferenceError: ph_is_present is not defined
[...]
wait_js_cond(ph_is_present("#toggle-menu")): ReferenceError: ph_wait_cond is not defined

That triggers a very strong déjà vu, @mvollmer recently fixed something very similar, or the same (but I can't find it now).

Pretty sure it's a flake, but retrying to be safe.

Copy link
Member

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed we should fix that in testlib.py itself, but the heck, it doesn't seem to break anything else..

@martinpitt
Copy link
Member

I get it -- this starts with the NFS SNAFU cockpit-project/bots#7137, so this needs naughties. And then browser is valid, but cockpit was never actually loaded (it's blank). That needs a machines fix. But that's independent.

It failed the same way in other PRs, so let's get this out of the way.

@martinpitt martinpitt merged commit b1ae874 into main Nov 26, 2024
28 of 29 checks passed
@martinpitt martinpitt deleted the cockpit-lib-update-cockpit-lib-20241121-025039 branch November 26, 2024 12:49
@@ -68,7 +68,8 @@ class TestMultiMachineVNC(VirtualMachinesCase):
self.goToVmPage(name)
b.wait_in_text(f"#vm-{name}-system-state", "Running")

b.add_machine(m2_host, known_host=True, password=None)
# Cockpit 329 warns the user before adding a remote host
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it doesn't. We explicitly switch the warning off.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants