Skip to content

Commit

Permalink
Makefile: Update Cockpit lib to 5ac51ecd0d5c4739d0478bee88efb8fb
Browse files Browse the repository at this point in the history
This new lib update now errors out on unexpected console.error messages,
these are harmless in podman and need to be allowed.

Closes #1458
  • Loading branch information
cockpituous authored and martinpitt committed Oct 19, 2023
1 parent 104c3ff commit 5bd629c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
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 = 01ae4cb7f2f52e1414a79e1c3d685d93042db859 # 302 + DynamicListForm fix
COCKPIT_REPO_COMMIT = 5ac51ecd0d5c4739d0478bee88efb8fb06f0988e # 303

$(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
Expand Down
9 changes: 9 additions & 0 deletions test/check-application
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ class TestApplication(testlib.MachineCase):
self.system_images_count = int(self.execute(True, "podman images -n | wc -l").strip())
self.user_images_count = int(self.execute(False, "podman images -n | wc -l").strip())

# allow console.error
self.allow_browser_errors(
".*couldn't search registry \".*\": pinging container registry .*",
".*Error occurred while connecting console: cannot resize session: cannot resize container.*",
)

def tearDown(self):
if self.getError():
# dump container logs for debugging
Expand Down Expand Up @@ -880,6 +886,7 @@ class TestApplication(testlib.MachineCase):

def _testCommit(self, auth):
b = self.browser
self.allow_browser_errors("Failed to commit container .*: CommitFailure: repository name must be lowercase")

self.login(auth)

Expand Down Expand Up @@ -2275,6 +2282,8 @@ class TestApplication(testlib.MachineCase):
b.wait_visible(".pf-v5-c-modal-box__footer #create-image-create-run-btn:not(:disabled)")

""" Test the validation errors"""
self.allow_browser_errors(
"error: Container failed to be started: Internal Server Error: rootlessport listen tcp 0.0.0.0:5000.*")
b = self.browser
self.login(False)
container_name = 'portused'
Expand Down

0 comments on commit 5bd629c

Please sign in to comment.