From b87a825d7448f87ea1f94da5fc9d6b211cd1334f Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Wed, 4 May 2016 13:46:44 +0200 Subject: fix stageuser tests (removal of has_keytab and has_password from find) User tests has been fixed, but stageuser tests was forgotten, this commit fixes it. https://fedorahosted.org/freeipa/ticket/5281 Reviewed-By: David Kupka --- ipatests/test_xmlrpc/tracker/stageuser_plugin.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ipatests/test_xmlrpc') diff --git a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py index 72edd3342..9cde16bc7 100644 --- a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py +++ b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py @@ -58,6 +58,9 @@ class StageUserTracker(Tracker): activate_keys = retrieve_keys | { u'has_keytab', u'has_password', u'nsaccountlock'} + find_keys = retrieve_keys - {u'has_keytab', u'has_password'} + find_all_keys = retrieve_all_keys - {u'has_keytab', u'has_password'} + def __init__(self, name, givenname, sn, **kwargs): super(StageUserTracker, self).__init__(default_version=None) self.uid = name @@ -188,9 +191,9 @@ class StageUserTracker(Tracker): def check_find(self, result, all=False, raw=False): """ Check 'stageuser-find' command result """ if all: - expected = self.filter_attrs(self.retrieve_all_keys) + expected = self.filter_attrs(self.find_all_keys) else: - expected = self.filter_attrs(self.retrieve_keys) + expected = self.filter_attrs(self.find_keys) # small override because stageuser-find returns different # type of nsaccountlock value than DS, but overall the value -- cgit