Skip to content

Commit

Permalink
Bump cockpit repo to 284
Browse files Browse the repository at this point in the history
This picks up a FileAutoComplete fix for running with the Python bridge.
(Fixes #1189)

This also picks up the "ugly zero" font fix from tabular numbers. Adjust
pixel tests accordingly.

Disable the "RTL" scenario, as it's still causing unstable reference
images, and we don't yet know what exactly to do with that in Cockpit.
  • Loading branch information
martinpitt committed Jan 25, 2023
1 parent 566a8d4 commit 0933864
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ COCKPIT_REPO_FILES = \
$(NULL)

COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
COCKPIT_REPO_COMMIT = e4a1c8a11c1fce7e038d1e2c05b2f35c4472d682 # 282.1 + #18077
COCKPIT_REPO_COMMIT = 80a7c7cfed9157915067666fe95b298896f2aea8 # 284

$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
Expand Down
21 changes: 13 additions & 8 deletions test/check-application
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,9 @@ class TestApplication(testlib.MachineCase):
# Show history
b.click("#containers-images tbody.pf-m-expanded .pf-c-tabs__list li:nth-child(2) button")
b.wait_in_text("#containers-images .pf-c-table__expandable-row.pf-m-expanded td[data-label=\"ID\"]:first", images['quay.io/libpod/busybox:latest'][:12])
b.assert_pixels('#containers-images .pf-c-table__expandable-row.pf-m-expanded', "history", ignore=[".ignore-pixels"])
b.assert_pixels('#containers-images .pf-c-table__expandable-row.pf-m-expanded', "history",
ignore=[".ignore-pixels"],
skip_layouts=["rtl"])
b.click(busybox_sel + " td.pf-c-table__toggle button")

# make sure no running containers shown; on CoreOS there's the cockpit/ws container
Expand Down Expand Up @@ -720,7 +722,7 @@ class TestApplication(testlib.MachineCase):
self.execute(auth, "podman run -d --name test-sh4 --stop-timeout 0 alpine sh")
self.waitContainerRow("test-sh4")
if auth:
b.assert_pixels('#app', "overview", ignore=[".ignore-pixels"])
b.assert_pixels('#app', "overview", ignore=[".ignore-pixels"], skip_layouts=["rtl"])
alpine_sel = f"#containers-images tbody tr[data-row-id={images['quay.io/libpod/alpine:latest']}{auth}]".lower()
b.wait_visible(alpine_sel)
b.click(alpine_sel + " td.pf-c-table__toggle button")
Expand Down Expand Up @@ -854,7 +856,7 @@ class TestApplication(testlib.MachineCase):
b.set_input_text("#commit-dialog-command", "sh -c 'ps'")

if auth:
b.assert_pixels(".pf-c-modal-box", "commit")
b.assert_pixels(".pf-c-modal-box", "commit", skip_layouts=["rtl"])

self.confirm_modal("Commit")

Expand Down Expand Up @@ -1004,7 +1006,7 @@ class TestApplication(testlib.MachineCase):

b.wait_visible(".pf-c-data-list .image-name:contains('localhost:5000/my-busybox')")
b.wait_visible(".pf-c-data-list .image-name:contains('localhost:6000/my-busybox')")
b.assert_pixels(".podman-search", "download")
b.assert_pixels(".podman-search", "download", skip_layouts=["rtl"])

b.set_val('#registry-select', "localhost:6000")
b.wait_not_present(".pf-c-data-list .image-name:contains('localhost:5000/my-busybox')")
Expand Down Expand Up @@ -1436,7 +1438,7 @@ class TestApplication(testlib.MachineCase):
# Local results found
b.set_input_text("#create-image-image-select-typeahead", "registry")
if auth:
b.assert_pixels(".pf-c-modal-box", "image-select")
b.assert_pixels(".pf-c-modal-box", "image-select", skip_layouts=["rtl"])
b.click('button.pf-c-toggle-group__button:contains("Local")')
b.wait_text("button.pf-c-select__menu-item", "quay.io/cockpit/registry:2")

Expand Down Expand Up @@ -1659,7 +1661,9 @@ class TestApplication(testlib.MachineCase):
b.click('.volume-form .btn-add')

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

if self.has_selinux:
b.set_val('#run-image-dialog-volume-1-selinux', "Z")
Expand Down Expand Up @@ -2098,7 +2102,7 @@ class TestApplication(testlib.MachineCase):
b.click('#run-image-healthcheck-retries button:nth-child(1)')
b.wait_val("#run-image-healthcheck-retries input", 2)
if auth:
b.assert_pixels('.pf-c-modal-box', "healthcheck-modal")
b.assert_pixels('.pf-c-modal-box', "healthcheck-modal", skip_layouts=["rtl"])
b.click('.pf-c-modal-box__footer #create-image-create-run-btn')

self.waitContainerRow("healthy")
Expand Down Expand Up @@ -2151,7 +2155,8 @@ class TestApplication(testlib.MachineCase):
b.assert_pixels(".pf-m-expanded .pf-c-table__expandable-row-content",
"healthcheck-details",
ignore=["thead", "#container-details-healthcheck dt:contains('Failing streak') + dd",
"td[data-label='Started at']"])
"td[data-label='Started at']"],
skip_layouts=["rtl"])

@testlib.nondestructive
def testHealthcheckSystem(self):
Expand Down
2 changes: 1 addition & 1 deletion test/reference

0 comments on commit 0933864

Please sign in to comment.