From c6d808ed231e7991f385e8a533d22800b2f5fbb6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 22 Apr 2024 17:29:44 -0700 Subject: [PATCH] Revert "Give `systemctl stop ipa.service` longer due to RHBZ #2100282" This reverts commit b203f41f55a4c918b8a0bff1f6fda851360071bb. The bug has been worked around for some time with a downstream patch. Dropping the extended timeout means we'll notice if the workaround is dropped prematurely or stops working. --- tests/role_deploy_domain_controller_check.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/role_deploy_domain_controller_check.pm b/tests/role_deploy_domain_controller_check.pm index a5b00236..c333efcc 100644 --- a/tests/role_deploy_domain_controller_check.pm +++ b/tests/role_deploy_domain_controller_check.pm @@ -26,10 +26,7 @@ sub run { # there are often cases where we need to see the logs (e.g. client # test failed due to server issue) $self->post_fail_hook(); - # FIXME as of 2022-06-22, this is taking longer than expected on - # Rawhide due to RHBZ #2100282 . It's hard to do 'soft fail if - # this takes too long', so let's just give it more time - assert_script_run 'systemctl stop ipa.service', 120; + assert_script_run 'systemctl stop ipa.service'; # check server is stopped assert_script_run '! systemctl is-active ipa.service'; # decommission the server