Rename various classes in tests

Author: Venefilyn

pkg/systemd/overview-cards/usageCard.jsx

@@ -135,7 +135,7 @@ export class UsageCard extends React.Component {
                                     <Progress value={this.state.cpuUsed}
                                         className="pf-m-sm"
                                         min={0} max={100}
-                                        variant={ this.state.cpuUsed > 90 ? ProgressVariant.danger : null }
+                                        variant={ this.state.cpuUsed > 90 ? ProgressVariant.danger : undefined }
                                         label={ this.state.cpuUsed + '% ' + cores_str }
                                         aria-labelledby="system-usage-cpu-progress"
                                         measureLocation={ProgressMeasureLocation.outside} />

test/common/storagelib.py

@@ -145,12 +145,12 @@ def dialog_wait_open(self):
 
     def dialog_wait_alert(self, text1, text2=None):
         def has_alert_title():
-            t = self.browser.text('#dialog .pf-v5-c-alert__title')
+            t = self.browser.text('#dialog .pf-v6-c-alert__title')
             return text1 in t or (text2 is not None and text2 in t)
         self.browser.wait(has_alert_title)
 
     def dialog_wait_title(self, text):
-        self.browser.wait_in_text('#dialog .pf-v5-c-modal-box__title', text)
+        self.browser.wait_in_text('#dialog .pf-v6-c-modal-box__title', text)
 
     def dialog_field(self, field):
         return f'#dialog [data-field="{field}"]'
@@ -193,8 +193,8 @@ def dialog_set_val(self, field, val):
                 self.browser.set_checked(sel + " input[type=checkbox]", val=True)
                 self.browser.set_input_text(sel + " [type=text]", val)
         elif ftype == "combobox":
-            self.browser.click(sel + " button.pf-v5-c-menu-toggle__button")
-            self.browser.click(sel + f" .pf-v5-c-menu li:contains('{val}') button")
+            self.browser.click(sel + " button.pf-v6-c-menu-toggle__button")
+            self.browser.click(sel + f" .pf-v6-c-menu li:contains('{val}') button")
         else:
             self.browser.set_val(sel, val)
 
@@ -228,7 +228,7 @@ def dialog_wait_val(self, field, val, unit=None):
 
     def dialog_wait_error(self, field, val):
         # XXX - allow for more than one error
-        self.browser.wait_in_text('#dialog .pf-v5-c-form__helper-text .pf-m-error', val)
+        self.browser.wait_in_text('#dialog .pf-v6-c-form__helper-text .pf-m-error', val)
 
     def dialog_wait_not_present(self, field):
         self.browser.wait_not_present(self.dialog_field(field))
@@ -367,7 +367,7 @@ def doit():
                 self.dialog_wait_close()
                 return True
             except Exception:
-                dialog_text = self.browser.text('#dialog .pf-v5-c-alert__title')
+                dialog_text = self.browser.text('#dialog .pf-v6-c-alert__title')
                 for err in errors:
                     if err in dialog_text:
                         print("WARNING: retrying dialog")
@@ -583,10 +583,10 @@ def card(self, title):
         return f"[data-test-card-title='{title}']"
 
     def card_parent_link(self):
-        return ".pf-v5-c-breadcrumb__item:nth-last-child(2) > a"
+        return ".pf-v6-c-breadcrumb__item:nth-last-child(2) > a"
 
     def card_header(self, title):
-        return self.card(title) + " .pf-v5-c-card__header"
+        return self.card(title) + " .pf-v6-c-card__header"
 
     def card_row(self, title, index=None, name=None, location=None):
         if index is not None:
@@ -614,17 +614,17 @@ def card_button(self, card_title, button_title):
         return self.card(card_title) + f" button:contains('{button_title}')"
 
     def dropdown_toggle(self, parent):
-        return parent + " .pf-v5-c-menu-toggle"
+        return parent + " .pf-v6-c-menu-toggle"
 
     def dropdown_action(self, parent, title):
-        return parent + f" .pf-v5-c-menu button:contains('{title}')"
+        return parent + f" .pf-v6-c-menu button:contains('{title}')"
 
     def dropdown_description(self, parent, title):
-        return parent + f" .pf-v5-c-menu button:contains('{title}') .pf-v5-c-menu__item-description"
+        return parent + f" .pf-v6-c-menu button:contains('{title}') .pf-v6-c-menu__item-description"
 
     def click_dropdown(self, parent, title):
         self.browser.click(self.dropdown_toggle(parent))
-        self.browser.click(self.dropdown_action(parent, title))
+        self.browser.click(self.dropdown_action("", title))
 
     def click_card_dropdown(self, card_title, button_title):
         self.click_dropdown(self.card_header(card_title), button_title)

test/common/testlib.py

@@ -722,7 +722,7 @@ def select_from_dropdown(self, selector: str, value: object) -> None:
         self.set_val(selector, value)
         self.wait_val(selector, value)
 
-    def select_PF(self, selector: str, value: str, menu_class: str = ".pf-v5-c-menu") -> None:
+    def select_PF(self, selector: str, value: str, menu_class: str = ".pf-v6-c-menu") -> None:
         """For a PatternFly Select-like component
 
         For things like <Select> or <TimePicker>. Unfortunately none of them render as an actual <select>, but a
@@ -752,12 +752,12 @@ def set_input_text(
             self.wait_val(selector, val)
 
     def set_file_autocomplete_val(self, group_identifier: str, location: str) -> None:
-        self.set_input_text(f"{group_identifier} .pf-v5-c-menu-toggle input", location)
+        self.set_input_text(f"{group_identifier} .pf-v6-c-menu-toggle input", location)
         # select the file
         self.wait_text(f"{group_identifier} ul li:nth-child(1) button", location)
         self.click(f"{group_identifier} ul li:nth-child(1) button")
-        self.wait_not_present(f"{group_identifier} .pf-v5-c-menu")
-        self.wait_val(f"{group_identifier} .pf-v5-c-menu-toggle input", location)
+        self.wait_not_present(f"{group_identifier} .pf-v6-c-menu")
+        self.wait_val(f"{group_identifier} .pf-v6-c-menu-toggle input", location)
 
     @contextlib.contextmanager
     def wait_timeout(self, timeout: int) -> Iterator[None]:
@@ -1112,9 +1112,9 @@ def become_superuser(
 
             if passwordless:
                 self.wait_in_text("div[role=dialog]", "Administrative access")
-                self.wait_in_text("div[role=dialog] .pf-v5-c-modal-box__body", "You now have administrative access.")
+                self.wait_in_text("div[role=dialog] .pf-v6-c-modal-box__body", "You now have administrative access.")
                 # there should be only one ("Close") button
-                self.click("div[role=dialog] .pf-v5-c-modal-box__footer button")
+                self.click("div[role=dialog] .pf-v6-c-modal-box__footer button")
             else:
                 self.wait_in_text("div[role=dialog]", "Switch to administrative access")
                 self.wait_in_text("div[role=dialog]", f"Password for {user}:")
@@ -1148,7 +1148,7 @@ def click_system_menu(self, path: str, enter: bool = True) -> None:
 
     def get_pf_progress_value(self, progress_bar_sel: str) -> int:
         """Get numeric value of a PatternFly <ProgressBar> component"""
-        sel = progress_bar_sel + " .pf-v5-c-progress__indicator"
+        sel = progress_bar_sel + " .pf-v6-c-progress__indicator"
         self.wait_visible(sel)
         self.wait_attr_contains(sel, "style", "width:")
         style = self.attr(sel, "style")
@@ -1517,7 +1517,7 @@ def assert_pixels(
         if not self.is_present("#shell-page") and not self.is_present("#login-details") and not self.is_present("#system-terminal-page"):
             classes = self.attr("main", "class")
             if "pf-v5-c-page__main" in classes:
-                self.set_attr("main.pf-v5-c-page__main", "class", f"{classes} pixel-test")
+                self.set_attr("main.pf-v6-c-page__main", "class", f"{classes} pixel-test")
 
         # move the mouse to a harmless place where it doesn't accidentally focus anything (as that changes UI)
         self.bidi("input.performActions", context=self.driver.context, actions=[{

test/verify/check-apps

@@ -103,28 +103,28 @@ class TestApps(packagelib.PackageCase):
             m.write("/etc/cockpit/cockpit.conf", f"[WebService]\nUrlRoot={urlroot}")
 
         self.login_and_go("/apps", urlroot=urlroot)
-        b.wait_in_text(".pf-v5-c-empty-state", "No applications installed or available")
-        b.wait_in_text(".pf-v5-c-empty-state", "Application information is missing")
+        b.wait_in_text(".pf-v6-c-empty-state", "No applications installed or available")
+        b.wait_in_text(".pf-v6-c-empty-state", "Application information is missing")
 
         # still no metadata, but already installed application
         self.createAppStreamPackage("already", "1.0", "1", install=True)
-        b.wait_not_present(".pf-v5-c-empty-state")
+        b.wait_not_present(".pf-v6-c-empty-state")
         b.wait_visible(".app-list .pf-v5-c-data-list__item-row:contains('already') button:contains('Remove')")
-        b.wait_in_text(".pf-v5-c-alert", "Application information is missing")
+        b.wait_in_text(".pf-v6-c-alert", "Application information is missing")
 
         self.createAppStreamPackage("app-1", "1.0", "1")
         self.createAppStreamRepoPackage()
 
         # Install package metadata
-        b.click(".pf-v5-c-alert button")
+        b.click(".pf-v6-c-alert button")
 
         with b.wait_timeout(30):
-            b.wait_not_present(".pf-v5-c-alert")
+            b.wait_not_present(".pf-v6-c-alert")
             b.click(".app-list #app-1")
 
         b.wait_visible('a[href="https://app-1.com"]')
         b.wait_visible(f'#app-page img[src^="{urlroot}/cockpit/channel/"]')
-        b.click(".pf-v5-c-breadcrumb a:contains('Applications')")
+        b.click(".pf-v6-c-breadcrumb a:contains('Applications')")
 
         b.wait_visible("#list-page")
         b.wait_not_present("#app-page")
@@ -169,7 +169,7 @@ class TestApps(packagelib.PackageCase):
         self.createAppStreamRepoPackage(subdir="app-info/xmls")
 
         self.login_and_go("/apps")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
 
         # os-release is a symlink target, don't clobber that
         self.restore_file("/etc/os-release")
@@ -180,21 +180,21 @@ class TestApps(packagelib.PackageCase):
         # the progress bar is too fast to reliably catch it
         time.sleep(1)
         b.wait_not_present("#refresh-progress")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
         # wait until check for installed metadata package finished
         b.wait_attr("#list-page", "data-packages-checked", "true")
         # no appstream metadata available, don't advertise it
-        b.wait_in_text(".pf-v5-c-empty-state", "No applications installed or available")
-        self.assertNotIn("Install application information", b.text(".pf-v5-c-empty-state"))
-        b.wait_not_present(".pf-v5-c-empty-state button")
+        b.wait_in_text(".pf-v6-c-empty-state", "No applications installed or available")
+        self.assertNotIn("Install application information", b.text(".pf-v6-c-empty-state"))
+        b.wait_not_present(".pf-v6-c-empty-state button")
 
         # unknown OS: nothing gets installed
         m.write("/etc/os-release", 'ID="unmapped"\nID_LIKE="mysterious"\nVERSION_ID="1"\n')
         b.click("#refresh")
         # the progress bar is too fast to reliably catch it
         time.sleep(1)
         b.wait_not_present("#refresh-progress")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
 
         # known OS: appstream-data-test gets installed from the map
         m.write("/etc/os-release", 'ID="derivative"\nID_LIKE="spicy testy"\nVERSION_ID="1"\n')
@@ -215,7 +215,7 @@ class TestApps(packagelib.PackageCase):
         self.addCleanup(m.execute, "for d in /usr/share/metainfo /usr/share/app-info /var/cache/app-info; do umount $d; done")
 
         self.login_and_go("/apps")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
 
         m.write("/usr/share/app-info/xmls/test.xml", """
 <components origin="test">
@@ -273,7 +273,7 @@ class TestApps(packagelib.PackageCase):
         appstream_folder = "/usr/share/app-info/xmls"
 
         self.login_and_go("/apps")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
 
         self.allow_journal_messages(".*/usr/share/app-info/xmls/test.xml.*",
                                     ".*xml.etree.ElementTree.ParseError.*")
@@ -293,7 +293,7 @@ class TestApps(packagelib.PackageCase):
     <pkgname>foo</pkgname>
   </component>
 </components>""")
-            b.wait_not_present(".pf-v5-c-empty-state")
+            b.wait_not_present(".pf-v6-c-empty-state")
             b.wait_visible(".app-list .pf-v5-c-data-list__item-row:contains('Summary')")
 
         # First lay down some good XML so that we can later detect the reaction to broken XML.
@@ -303,14 +303,14 @@ class TestApps(packagelib.PackageCase):
         m.write(f"{appstream_folder}/test.xml", """
 This <is <not XML.
 """)
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
         reset()
 
         # Not really AppStream
         m.write(f"{appstream_folder}/test.xml", """
 <foo></foo>
 """)
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
         reset()
 
         # No origin
@@ -328,7 +328,7 @@ This <is <not XML.
     <pkgname>foo</pkgname>
   </component>
 </components>""")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
         reset()
 
         # No package
@@ -345,7 +345,7 @@ This <is <not XML.
     <launchable type="cockpit-manifest">foo</launchable>
   </component>
 </components>""")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
         reset()
 
         # No id
@@ -359,7 +359,7 @@ This <is <not XML.
     <pkgname>foo</pkgname>
   </component>
 </components>""")
-        b.wait_visible(".pf-v5-c-empty-state")
+        b.wait_visible(".pf-v6-c-empty-state")
         reset()
 
         # Error (launchable without type) in earlier entry, shouldn't affect the later entry
@@ -388,7 +388,7 @@ This <is <not XML.
     <pkgname>foo</pkgname>
   </component>
 </components>""")
-        b.wait_not_present(".pf-v5-c-empty-state")
+        b.wait_not_present(".pf-v6-c-empty-state")
         b.wait_visible(".app-list .pf-v5-c-data-list__item-row:contains('Summary 2')")
 
     def testNoPackageKit(self):

test/verify/check-client

@@ -142,12 +142,12 @@ exec "$@"
         # python3-pcp is installed on client, but not on target; recognize that
         b.go("/metrics")
         b.enter_page("/metrics")
-        b.wait_in_text(".pf-v5-c-empty-state", "PCP is missing")
+        b.wait_in_text(".pf-v6-c-empty-state", "PCP is missing")
         # on-demand install is allowed
-        b.wait_in_text(".pf-v5-c-empty-state button.pf-m-primary", "Install PCP support")
-        b.click(".pf-v5-c-empty-state button.pf-m-primary")
-        b.wait_in_text(".pf-v5-c-modal-box", "pcp will be installed")
-        b.click(".pf-v5-c-modal-box button.cancel")
+        b.wait_in_text(".pf-v6-c-empty-state button.pf-m-primary", "Install PCP support")
+        b.click(".pf-v6-c-empty-state button.pf-m-primary")
+        b.wait_in_text(".pf-v6-c-modal-box", "pcp will be installed")
+        b.click(".pf-v6-c-modal-box button.cancel")
 
         b.drop_superuser()
         self.logout()
@@ -181,10 +181,10 @@ exec "$@"
 
         # not a sudoer
         b.open_superuser_dialog()
-        b.set_input_text(".pf-v5-c-modal-box:contains('Switch to administrative access') input", "barfoo")
-        b.click(".pf-v5-c-modal-box button:contains('Authenticate')")
-        b.click(".pf-v5-c-modal-box:contains('Problem becoming administrator') button:contains('Close')")
-        b.wait_not_present(".pf-v5-c-modal-box")
+        b.set_input_text(".pf-v6-c-modal-box:contains('Switch to administrative access') input", "barfoo")
+        b.click(".pf-v6-c-modal-box button:contains('Authenticate')")
+        b.click(".pf-v6-c-modal-box:contains('Problem becoming administrator') button:contains('Close')")
+        b.wait_not_present(".pf-v6-c-modal-box")
         b.check_superuser_indicator("Limited access")
 
         self.logout()

test/verify/check-connection

@@ -144,7 +144,7 @@ class TestConnection(testlib.MachineCase):
                 b.wait_visible(".curtains-ct")
 
             b.wait_in_text(".curtains-ct h1", "Disconnected")
-            b.wait_in_text('.curtains-ct .pf-v5-c-empty-state__body', "Connection has timed out.")
+            b.wait_in_text('.curtains-ct .pf-v6-c-empty-state__body', "Connection has timed out.")
         finally:
             m.execute("nft delete table ip cockpittest")
 
@@ -1056,7 +1056,7 @@ until pgrep -f '^(/usr/[^ ]+/[^ /]*python[^ /]* )?/usr/bin/cockpit-bridge'; do s
         b.set_val("#login-password-input", "foobar")
         b.click('#login-button')
 
-        b.wait_text(".early-failure .pf-v5-c-empty-state__title", "Connection failed")
+        b.wait_text(".early-failure .pf-v6-c-empty-state__title", "Connection failed")
         b.wait_in_text(".early-failure ", "unexpected error while connecting to the machine")
 
         testlib.wait(lambda: m.execute("grep 'received request from bad Origin' /var/log/ws-notls.log"))
@@ -1451,7 +1451,7 @@ server {
         b.set_val("#login-user-input", "admin")
         b.set_val("#login-password-input", "foobar")
         b.click('#login-button')
-        b.wait_visible('.pf-v5-c-card.system-health')
+        b.wait_visible('.pf-v6-c-card.system-health')
 
     @testlib.skipImage("nginx not installed", "centos-*", "rhel-*", "debian-*", "ubuntu-*", "arch")
     @testlib.skipOstree("nginx not installed")