@@ -590,9 +590,10 @@ class TestHistoryMetrics(testlib.MachineCase):
590
590
m .execute ("firewall-cmd --reload" )
591
591
592
592
redis = customRedisService or redisService (m .image )
593
+ redis_service = f"{ redis } .target" if "suse" in m .image else f"{ redis } .service"
593
594
hostname = m .execute ("hostname" ).strip ()
594
595
595
- self .addCleanup (m .execute , f"systemctl disable --now { redis } " )
596
+ self .addCleanup (m .execute , f"systemctl disable --now { redis_service } " )
596
597
597
598
def checkEnable (firewalld_alert ):
598
599
b .click ("#metrics-header-section button.pf-m-secondary" )
@@ -607,7 +608,7 @@ class TestHistoryMetrics(testlib.MachineCase):
607
608
b .wait_not_present (".pf-v5-c-alert:contains(pmproxy)" )
608
609
m .execute ('while [ $(systemctl is-active pmproxy) = activating ]; do sleep 1; done' )
609
610
self .assertEqual (m .execute ("systemctl is-active pmproxy" ).strip (), "active" )
610
- self .assertEqual (m .execute (f"systemctl is-active { redis } " ).strip (), "active" )
611
+ self .assertEqual (m .execute (f"systemctl is-active { redis_service } " ).strip (), "active" )
611
612
self .assertEqual (m .execute ("systemctl is-enabled pmproxy" ).strip (), "enabled" )
612
613
self .assertIn (redis , m .execute ("systemctl show -p Wants --value pmproxy" ).strip ())
613
614
testlib .wait (lambda : hostname in m .execute ("curl --max-time 10 --silent --show-error 'http://localhost:44322/series/labels?names=hostname'" ), delay = 10 , tries = 30 )
@@ -624,13 +625,13 @@ class TestHistoryMetrics(testlib.MachineCase):
624
625
self .assertEqual (m .execute ("! systemctl is-active pmproxy" ).strip (), "inactive" )
625
626
self .assertEqual (m .execute ("! systemctl is-enabled pmproxy" ).strip (), "disabled" )
626
627
# keeps redis running, it's a shared service
627
- self .assertEqual (m .execute (f"systemctl is-active { redis } " ).strip (), "active" )
628
+ self .assertEqual (m .execute (f"systemctl is-active { redis_service } " ).strip (), "active" )
628
629
# but drops the pmproxy dependency
629
630
self .assertNotIn (redis , m .execute ("systemctl show -p Wants --value pmproxy" ).strip ())
630
631
m .execute ("! curl --silent --show-error --max-time 10 'http://localhost:44322/series/labels?names=hostname' 2>&1" )
631
632
632
633
# start in a defined state; all test images have pcp and redis pre-installed
633
- m .execute (f"systemctl disable --now pmlogger pmie pmproxy { redis } " )
634
+ m .execute (f"systemctl disable --now pmlogger pmie pmproxy { redis_service } " )
634
635
m .execute ("systemctl reset-failed" )
635
636
# ensure pmproxy is not already opened in firewall
636
637
m .execute ("firewall-cmd --remove-service pmproxy; firewall-cmd --permanent --remove-service pmproxy" )
@@ -654,12 +655,12 @@ class TestHistoryMetrics(testlib.MachineCase):
654
655
checkDisable ()
655
656
656
657
# redis already running
657
- m .execute (f"systemctl start { redis } " )
658
+ m .execute (f"systemctl start { redis_service } " )
658
659
checkEnable (firewalld_alert = True )
659
660
checkDisable ()
660
661
661
662
# pmproxy already running; 44322 queries hang without redis and until restart
662
- m .execute (f"systemctl disable --now { redis } ; systemctl start pmproxy" )
663
+ m .execute (f"systemctl disable --now { redis_service } ; systemctl start pmproxy" )
663
664
checkEnable (firewalld_alert = True )
664
665
665
666
# without firewalld
@@ -738,9 +739,9 @@ class TestHistoryMetrics(testlib.MachineCase):
738
739
else :
739
740
raise testlib .Error ("PCP settings dialog did not get expected value" )
740
741
741
- m .execute (f"systemctl stop { redis } " )
742
+ m .execute (f"systemctl stop { redis_service } " )
742
743
checkEnabled (expected = False )
743
- m .execute (f"systemctl start { redis } " )
744
+ m .execute (f"systemctl start { redis_service } " )
744
745
checkEnabled (expected = True )
745
746
m .execute ("systemctl stop pmproxy" )
746
747
checkEnabled (expected = False )
0 commit comments