Skip to content

Commit

Permalink
test: drop workaround for duplicate modal ids
Browse files Browse the repository at this point in the history
This was fixed in PatternFly already and in machines.

cockpit-project/cockpit-machines#1330

Related: cockpit-project#20973
  • Loading branch information
jelly committed Sep 10, 2024
1 parent 740a5c0 commit d2bde9d
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions test/verify/check-metrics
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ class TestHistoryMetrics(testlib.MachineCase):
super().setUp()
# start with a clean slate and avoid running into restart limits
self.machine.execute("systemctl stop pmlogger pmproxy; systemctl reset-failed pmlogger pmproxy 2>/dev/null || true")
# HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
self.pcp_dialog_selector = "#pcp-settings-modal:first-child"
self.pcp_dialog_selector = "#pcp-settings-modal"

def waitStream(self, current_max):
# should only have at most <current_max> valid minutes, the rest should be empty
Expand Down Expand Up @@ -1249,8 +1248,7 @@ BEGIN {{

@testlib.skipImage("TODO: Arch Linux packagekit support", "arch")
class TestMetricsPackages(packagelib.PackageCase):
# HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
pcp_dialog_selector = "#pcp-settings-modal:first-child"
pcp_dialog_selector = "#pcp-settings-modal"

def testBasic(self):
b = self.browser
Expand Down Expand Up @@ -1441,9 +1439,7 @@ class TestGrafanaClient(testlib.MachineCase):
m = self.machine
b = self.browser
mg = self.machines['services']

# HACK: PF modal can have multiple id's in certain scenario's https://github.com/patternfly/patternfly-react/issues/9399
pcp_dialog_selector = "#pcp-settings-modal:first-child"
pcp_dialog_selector = "#pcp-settings-modal"

# avoid dynamic host name changes during PCP data collection, and start from clean slate
m.execute("""systemctl stop pmlogger || true
Expand Down

0 comments on commit d2bde9d

Please sign in to comment.