Hi,

attached patches fix test fails occuring since patch for [1] was pushed.

Ticket for tests: https://fedorahosted.org/freeipa/ticket/6240

Lenka


[1] https://fedorahosted.org/freeipa/ticket/5764

From 4e152c92008ebcab69aa07d2a1f50649e71563ab Mon Sep 17 00:00:00 2001
From: Lenka Doudova <ldoud...@redhat.com>
Date: Mon, 22 Aug 2016 10:32:50 +0200
Subject: [PATCH 1/2] Tests: Host tracker does not recognize
 'ipakrboktoauthasdelegate' attribute

Due to [1] being implemented, retrieve and search tests with --all option
specified fail due to extra attribute.

[1] https://fedorahosted.org/freeipa/ticket/5764

Ticket: https://fedorahosted.org/freeipa/ticket/6240
---
 ipatests/test_xmlrpc/tracker/host_plugin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipatests/test_xmlrpc/tracker/host_plugin.py b/ipatests/test_xmlrpc/tracker/host_plugin.py
index 45be169e0c9567f8c7d7a73f2eb8155e9c3d6cfc..756190667bdfb56db970a3914814b07fc4c8b9dc 100644
--- a/ipatests/test_xmlrpc/tracker/host_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/host_plugin.py
@@ -40,7 +40,7 @@ class HostTracker(KerberosAliasMixin, Tracker):
     retrieve_all_keys = retrieve_keys | {
         u'cn', u'ipakrbokasdelegate', u'ipakrbrequirespreauth', u'ipauniqueid',
         u'krbcanonicalname', u'managing_host', u'objectclass',
-        u'serverhostname'}
+        u'serverhostname', u'ipakrboktoauthasdelegate'}
     create_keys = retrieve_keys | {'objectclass', 'ipauniqueid',
                                    'randompassword'}
     update_keys = retrieve_keys - {'dn'}
@@ -112,6 +112,7 @@ class HostTracker(KerberosAliasMixin, Tracker):
             ipakrbrequirespreauth=True,
             managing_host=[self.fqdn],
             serverhostname=[self.shortname],
+            ipakrboktoauthasdelegate=False,
         )
         self.exists = True
 
-- 
2.7.4

From 36695099f1c2b500c7bb1633db387775f1e2ff3d Mon Sep 17 00:00:00 2001
From: Lenka Doudova <ldoud...@redhat.com>
Date: Mon, 22 Aug 2016 12:08:04 +0200
Subject: [PATCH 2/2] Tests: Service tracker and tests don't recognize
 'ipakrboktoauthasdelegate' attribute

Due to [1] being implemented, retrieve and search tests with --all option
specified fail due to extra attribute.

[1] https://fedorahosted.org/freeipa/ticket/5764

Ticket: https://fedorahosted.org/freeipa/ticket/6240
---
 ipatests/test_xmlrpc/test_service_plugin.py    | 2 ++
 ipatests/test_xmlrpc/tracker/service_plugin.py | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py
index 56e2c7a7a0570cb15dc5d27dcdba488da089350f..0e8c8ea30aa48a4e47b5a6f816995f6a7c81f258 100644
--- a/ipatests/test_xmlrpc/test_service_plugin.py
+++ b/ipatests/test_xmlrpc/test_service_plugin.py
@@ -256,6 +256,7 @@ class test_service(Declarative):
                     has_keytab=False,
                     ipakrbrequirespreauth=True,
                     ipakrbokasdelegate=False,
+                    ipakrboktoauthasdelegate=False,
                 ),
             ),
         ),
@@ -319,6 +320,7 @@ class test_service(Declarative):
                         managedby_host=[fqdn1],
                         ipakrbrequirespreauth=True,
                         ipakrbokasdelegate=False,
+                        ipakrboktoauthasdelegate=False,
                     ),
                 ],
             ),
diff --git a/ipatests/test_xmlrpc/tracker/service_plugin.py b/ipatests/test_xmlrpc/tracker/service_plugin.py
index 3b970b98985f6d0528aba369064f889256853b79..fe34390e268b53cc4717ce75aff1dddd39c510a7 100644
--- a/ipatests/test_xmlrpc/tracker/service_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/service_plugin.py
@@ -44,7 +44,7 @@ class ServiceTracker(KerberosAliasMixin, Tracker):
         u'ipaKrbPrincipalAlias', u'ipaUniqueID', u'krbExtraData',
         u'krbLastPwdChange', u'krbLoginFailedCount', u'memberof',
         u'objectClass', u'ipakrbrequirespreauth',
-        u'ipakrbokasdelegate'}
+        u'ipakrbokasdelegate', u'ipakrboktoauthasdelegate'}
 
     create_keys = (retrieve_keys | {u'objectclass', u'ipauniqueid'}) - {
         u'usercertificate', u'has_keytab'}
@@ -94,7 +94,8 @@ class ServiceTracker(KerberosAliasMixin, Tracker):
             u'ipauniqueid': [fuzzy_uuid],
             u'managedby_host': [self.host_fqdn],
             u'krbcanonicalname': [u'{0}'.format(self.name)],
-            u'has_keytab': False
+            u'has_keytab': False,
+            u'ipakrboktoauthasdelegate': False,
         }
 
         for key in self.options:
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to