diff --git a/Makefile b/Makefile index 66c7e50d1..927dd1180 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ COCKPIT_REPO_FILES = \ $(NULL) COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git -COCKPIT_REPO_COMMIT = b5a98be3e0601b45cd8a557cde1c80b896a903fb # 322 + 19 commits +COCKPIT_REPO_COMMIT = 8ede522e5066e680850dd2ae049e2e24f99c4230 # 322 + 30 commits $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' @@ -127,12 +127,9 @@ devel-uninstall: print-version: @echo "$(VERSION)" -# required for running integration tests; commander and ws are deps of chrome-remote-interface +# required for running integration tests TEST_NPMS = \ - node_modules/chrome-remote-interface \ - node_modules/commander \ node_modules/sizzle \ - node_modules/ws \ $(NULL) dist: $(TARFILE) diff --git a/node_modules b/node_modules index 5ab1c64fb..807ecf687 160000 --- a/node_modules +++ b/node_modules @@ -1 +1 @@ -Subproject commit 5ab1c64fbe627f0f53945d19d0a47ca37c07cde3 +Subproject commit 807ecf68797fd1824d826221b21a65ddc64f3552 diff --git a/package.json b/package.json index 784a688a2..c11ab8cd9 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "devDependencies": { "argparse": "2.0.1", "buffer": "6.0.3", - "chrome-remote-interface": "0.33.2", "esbuild": "0.23.0", "esbuild-plugin-copy": "2.1.1", "esbuild-plugin-replace": "1.4.0", @@ -33,6 +32,7 @@ "eslint-plugin-react": "7.35.0", "eslint-plugin-react-hooks": "4.6.2", "gettext-parser": "8.0.0", + "glob": "11.0.0", "htmlparser": "1.7.7", "ipaddr.js": "2.2.0", "jed": "1.1.1", diff --git a/test/browser/run-test.sh b/test/browser/run-test.sh index 4b2899905..2add1301a 100644 --- a/test/browser/run-test.sh +++ b/test/browser/run-test.sh @@ -14,7 +14,7 @@ if [ -e .git ]; then mv .git dot-git else # upstream tarballs ship test dependencies; print version for debugging - grep '"version"' node_modules/chrome-remote-interface/package.json + grep '"version"' node_modules/sizzle/package.json fi . /run/host/usr/lib/os-release diff --git a/test/check-machines-networks b/test/check-machines-networks index 160aa887d..9927e72ad 100755 --- a/test/check-machines-networks +++ b/test/check-machines-networks @@ -124,7 +124,7 @@ class TestMachinesNetworks(machineslib.VirtualMachinesCase): b.click(".pf-v5-c-card .pf-v5-c-card__header button:contains(Network)") # HACK: Firefox 112 on RHEL 8 does not have `:has` yet, so for now use JavaScript to obtain the elements parent sibling. - b.inject_js(""" + b.eval_js(""" ph_input_form_helper_text = function(id) { return document.getElementById(id).parentElement.parentElement.querySelector(".pf-v5-c-helper-text__item.pf-m-error").textContent diff --git a/test/machineslib.py b/test/machineslib.py index 6c377c821..13ad0f42b 100644 --- a/test/machineslib.py +++ b/test/machineslib.py @@ -442,7 +442,7 @@ def stop_all(): self.allow_journal_messages(r".* couldn't get all properties of org.freedesktop.NetworkManager.Device at /org/freedesktop/NetworkManager/Devices/\d+: Timeout was reached") # avoid error noise about resources getting cleaned up - self.addCleanup(lambda: not self.browser.cdp.valid or self.browser.logout()) + self.addCleanup(lambda: not self.browser.valid or self.browser.logout()) # noVNC warns about this for non-TLS connections; for RHEL downstream testing self.allow_browser_errors("noVNC requires a secure context") @@ -505,7 +505,7 @@ def downloadVmsArtifacts(self): def tearDown(self): b = self.browser - if b.cdp.valid and b.is_present("#button.alert-link.more-button"): + if b.valid and b.is_present("#button.alert-link.more-button"): b.click("button.alert-link.more-button") if self.getError(): diff --git a/test/reference b/test/reference index 7a45f4ede..8ee2e589c 160000 --- a/test/reference +++ b/test/reference @@ -1 +1 @@ -Subproject commit 7a45f4ede36abc972541efad9b0cb56488ef0afe +Subproject commit 8ee2e589cb8448aaf4bd8cf07f22b3cbebc18739