From e7edac30a10c0da40d7cfd625e19bd4237b9e1f6 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Tue, 4 Nov 2014 12:29:32 +0100 Subject: Fix CI tests: install_adtrust IPA uses both named and named-pkcs11 service. If named is masked use named-pkcs11, instead of raising exception Reviewed-By: Petr Viktorin --- ipatests/test_integration/tasks.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ipatests/test_integration') diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index 4ed4662a0..1458d7f93 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -278,7 +278,15 @@ def install_adtrust(host): # Restart named because it lost connection to dirsrv # (Directory server restarts during the ipa-adtrust-install) - host.run_command(['systemctl', 'restart', 'named']) + # we use two services named and named-pkcs11, + # if named is masked restart named-pkcs11 + result = host.run_command(['systemctl', 'is-enabled', 'named'], + raiseonerr=False) + if result.stdout_text.startswith("masked"): + host.run_command(['systemctl', 'restart', 'named-pkcs11']) + else: + host.run_command(['systemctl', 'restart', 'named']) + # Check that named is running and has loaded the information from LDAP dig_command = ['dig', 'SRV', '+short', '@localhost', -- cgit