diff options
| author | Martin Basti <mbasti@redhat.com> | 2014-11-04 12:29:32 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@dhcp-31-13.brq.redhat.com> | 2014-11-04 16:23:41 +0100 |
| commit | e7edac30a10c0da40d7cfd625e19bd4237b9e1f6 (patch) | |
| tree | 43df2377f97cd40e33fc30b86acf942f7eda5c12 | |
| parent | 7eca640ffa3e661140843d91dc4a846d3355a242 (diff) | |
| download | freeipa-e7edac30a10c0da40d7cfd625e19bd4237b9e1f6.tar.gz freeipa-e7edac30a10c0da40d7cfd625e19bd4237b9e1f6.tar.xz freeipa-e7edac30a10c0da40d7cfd625e19bd4237b9e1f6.zip | |
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 <pviktori@redhat.com>
| -rw-r--r-- | ipatests/test_integration/tasks.py | 10 |
1 files changed, 9 insertions, 1 deletions
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', |