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 c295842a0336c9e967a0c5adc28ddf52 #1906

Merged
merged 2 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ COCKPIT_REPO_FILES = \
$(NULL)

COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
COCKPIT_REPO_COMMIT = 6d478ad51585d9d7f8c4567c155bd641635f284f # 327 + 33 commits
COCKPIT_REPO_COMMIT = c295842a0336c9e967a0c5adc28ddf527876c6c6 # 328

$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
Expand Down
10 changes: 5 additions & 5 deletions test/check-application
Original file line number Diff line number Diff line change
Expand Up @@ -2025,7 +2025,7 @@ class TestApplication(testlib.MachineCase):
else:
b.wait_not_present('#run-image-dialog-volume-0-selinux')

b.set_file_autocomplete_val("#run-image-dialog-volume-0 .pf-v5-c-select", rodir)
b.set_file_autocomplete_val("#run-image-dialog-volume-0", rodir)
b.set_input_text('#run-image-dialog-volume-0-container-path', '/tmp/ro')
ro_label = m.execute(f"ls -dZ {rodir}").split(" ")[0]
b.click('.volume-form .btn-add')
Expand All @@ -2036,15 +2036,15 @@ class TestApplication(testlib.MachineCase):

if auth:
b.assert_pixels(".pf-v5-c-modal-box", "integration",
ignore=["#run-image-dialog-volume-0 .pf-v5-c-select__toggle-typeahead"],
ignore=["#run-image-dialog-volume-0 .pf-v5-c-text-input-group__text-input"],
skip_layouts=["rtl"])

if self.has_selinux:
b.set_val('#run-image-dialog-volume-2-selinux', "Z")
else:
b.wait_not_present('#run-image-dialog-volume-2-selinux')

b.set_file_autocomplete_val("#run-image-dialog-volume-2 .pf-v5-c-select", rwdir)
b.set_file_autocomplete_val("#run-image-dialog-volume-2", rwdir)
b.set_input_text('#run-image-dialog-volume-2-container-path', '/tmp/rw')
rw_label = m.execute(f"ls -dZ {rwdir}").split(" ")[0]

Expand Down Expand Up @@ -3022,11 +3022,11 @@ class TestApplication(testlib.MachineCase):
else:
b.wait_not_present('#create-pod-dialog-volume-0-selinux')

b.set_file_autocomplete_val("#create-pod-dialog-volume-0 .pf-v5-c-select", rodir)
b.set_file_autocomplete_val("#create-pod-dialog-volume-0", rodir)
b.set_input_text('#create-pod-dialog-volume-0-container-path', '/tmp/ro')
b.click('.volume-form .btn-add')

b.set_file_autocomplete_val("#create-pod-dialog-volume-1 .pf-v5-c-select", rwdir)
b.set_file_autocomplete_val("#create-pod-dialog-volume-1", rwdir)
b.set_input_text('#create-pod-dialog-volume-1-container-path', '/tmp/rw')

b.click("#create-pod-create-btn")
Expand Down