Skip to content

Commit

Permalink
Makefile: Update Cockpit lib to 118d89a84afdccda8d799579b68fee28
Browse files Browse the repository at this point in the history
Adjust the test CSS selectors to the fixed ListingTable from
cockpit-project/cockpit@1a903b480

Closes #1462
  • Loading branch information
cockpituous authored and jelly committed Oct 26, 2023
1 parent 9ff5884 commit 7cec14c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ COCKPIT_REPO_FILES = \
$(NULL)

COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
COCKPIT_REPO_COMMIT = 5ac51ecd0d5c4739d0478bee88efb8fb06f0988e # 303
COCKPIT_REPO_COMMIT = 118d89a84afdccda8d799579b68fee2808d96a30 # 303 + 38 commits

$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
Expand Down
8 changes: 4 additions & 4 deletions test/check-application
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ class TestApplication(testlib.MachineCase):
b.wait_in_text("#containers-images tbody.pf-m-expanded tr .image-details:first-child", "Command/run.sh")
# Show history
b.click("#containers-images tbody.pf-m-expanded .pf-v5-c-tabs__list li:nth-child(2) button")
first_row_sel = "#containers-images .pf-v5-c-table__expandable-row.pf-m-expanded tr:first-child"
first_row_sel = "#containers-images .pf-v5-c-table__expandable-row.pf-m-expanded tbody:first-of-type"
b.wait_in_text(f"{first_row_sel} td[data-label=\"ID\"]",
images[IMG_HELLO_LATEST][:12])
created_sel = f"{first_row_sel} td[data-label=\"Created\"]"
Expand All @@ -629,7 +629,7 @@ class TestApplication(testlib.MachineCase):
b.wait_in_text(f"{created_sel}", "COPY")
b.wait_in_text(f"{created_sel}", "in /test2.txt")
# initial (first) layer
last_row_sel = "#containers-images .pf-v5-c-table__expandable-row.pf-m-expanded tr:last-child"
last_row_sel = "#containers-images .pf-v5-c-table__expandable-row.pf-m-expanded tbody:last-of-type"
b.wait_in_text(f"{last_row_sel} td[data-label=\"Created by\"]", "COPY")

self.execute(auth, f"podman rmi {IMG_HELLO_LATEST}")
Expand Down Expand Up @@ -2248,8 +2248,8 @@ class TestApplication(testlib.MachineCase):
b.click("button:contains(Prune unused containers)")

if auth:
b.wait_in_text(".pf-v5-c-modal-box__body tbody tr:nth-child(1) td[data-label=Name]", "adminnotrunning")
b.wait_in_text(".pf-v5-c-modal-box__body tbody tr:nth-child(2) td[data-label=Name]", "notrunning")
b.wait_in_text(".pf-v5-c-modal-box__body tbody:nth-of-type(1) td[data-label=Name]", "adminnotrunning")
b.wait_in_text(".pf-v5-c-modal-box__body tbody:nth-of-type(2) td[data-label=Name]", "notrunning")
else:
b.wait_in_text(".pf-v5-c-modal-box__body tbody td[data-label=Name]", "notrunning")

Expand Down

0 comments on commit 7cec14c

Please sign in to comment.