summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2016-11-29 11:10:22 -0500
committerJan Cholasta <jcholast@redhat.com>2017-02-15 07:13:37 +0100
commitd2f5fc304f1938d23171ae330fa20b213ceed54e (patch)
treeb77e05211632aef8e08cb3cd937d8498d9391ed5 /ipatests
parentb6741d81e187fc84177c12ef8ad900d3b5cda6a4 (diff)
downloadfreeipa-d2f5fc304f1938d23171ae330fa20b213ceed54e.tar.gz
freeipa-d2f5fc304f1938d23171ae330fa20b213ceed54e.tar.xz
freeipa-d2f5fc304f1938d23171ae330fa20b213ceed54e.zip
Configure HTTPD to work via Gss-Proxy
https://fedorahosted.org/freeipa/ticket/4189 https://fedorahosted.org/freeipa/ticket/5959 Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_integration/tasks.py2
-rw-r--r--ipatests/test_integration/test_caless.py4
-rw-r--r--ipatests/test_integration/test_trust.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index f6fa45140..95234506d 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -474,7 +474,7 @@ def establish_trust_with_ad(master, ad_domain, extra_args=()):
"""
# Force KDC to reload MS-PAC info by trying to get TGT for HTTP
- master.run_command(['kinit', '-kt', paths.IPA_KEYTAB,
+ master.run_command(['kinit', '-kt', paths.HTTP_KEYTAB,
'HTTP/%s' % master.hostname])
master.run_command(['systemctl', 'restart', 'krb5kdc.service'])
master.run_command(['kdestroy', '-A'])
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
index e47984cf7..c0f4080a9 100644
--- a/ipatests/test_integration/test_caless.py
+++ b/ipatests/test_integration/test_caless.py
@@ -1169,7 +1169,7 @@ class TestIPACommands(CALessBase):
'--certificate', self.client_pem])
self.master.run_command(['ipa-getkeytab', '-s', self.master.hostname,
'-p' "host/%s" % self.test_hostname,
- '-k', paths.IPA_KEYTAB])
+ '-k', paths.HTTP_KEYTAB])
try:
yield
finally:
@@ -1186,7 +1186,7 @@ class TestIPACommands(CALessBase):
self.master.run_command(['ipa-getkeytab', '-s',
self.master.hostname,
'-p', self.test_service,
- '-k', paths.IPA_KEYTAB])
+ '-k', paths.HTTP_KEYTAB])
yield
def test_service_mod_doesnt_revoke(self):
diff --git a/ipatests/test_integration/test_trust.py b/ipatests/test_integration/test_trust.py
index 06bc4935b..b32e0ab97 100644
--- a/ipatests/test_integration/test_trust.py
+++ b/ipatests/test_integration/test_trust.py
@@ -334,7 +334,7 @@ class TestNonexternalTrustWithSubdomain(ADTrustSubdomainBase):
"""
def test_establish_trust(self):
""" Tests establishing non-external trust with Active Directory """
- self.master.run_command(['kinit', '-kt', paths.IPA_KEYTAB,
+ self.master.run_command(['kinit', '-kt', paths.HTTP_KEYTAB,
'HTTP/%s' % self.master.hostname])
self.master.run_command(['systemctl', 'restart', 'krb5kdc.service'])
self.master.run_command(['kdestroy', '-A'])
@@ -401,7 +401,7 @@ class TestNonexternalTrustWithTreedomain(ADTrustTreedomainBase):
"""
def test_establish_trust(self):
""" Tests establishing non-external trust with Active Directory """
- self.master.run_command(['kinit', '-kt', paths.IPA_KEYTAB,
+ self.master.run_command(['kinit', '-kt', paths.HTTP_KEYTAB,
'HTTP/%s' % self.master.hostname])
self.master.run_command(['systemctl', 'restart', 'krb5kdc.service'])
self.master.run_command(['kdestroy', '-A'])