From 44a2bdd8ead48b33b23bfb1e1f71027e5cfc5f04 Mon Sep 17 00:00:00 2001 From: Lenka Doudova Date: Wed, 17 Aug 2016 16:37:29 +0200 Subject: [PATCH] Tests: Fix failing tests in test_ipalib/test_frontend Some tests in ipatests/test_ipalib/test_frontend.py are failing due to changes related to thin client implementation. Providing fix for: ipa.test_ipalib.test_frontend.test_Attribute.test_init ipa.test_ipalib.test_frontend.test_LocalOrRemote.test_run https://fedorahosted.org/freeipa/ticket/6188 Reviewed-By: Milan Kubik --- ipalib/frontend.py | 2 +- ipatests/test_ipalib/test_frontend.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ipalib/frontend.py b/ipalib/frontend.py index 455b222d4..554d899d9 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -1181,7 +1181,7 @@ class LocalOrRemote(Command): When running in a server context, this command is always executed locally and the value of ``options['server']`` is ignored. """ - if options['server'] and not self.env.in_server: + if options.get('server', False) and not self.env.in_server: return self.forward(*args, **options) return self.execute(*args, **options) diff --git a/ipatests/test_ipalib/test_frontend.py b/ipatests/test_ipalib/test_frontend.py index c3dd9104c..892328a37 100644 --- a/ipatests/test_ipalib/test_frontend.py +++ b/ipatests/test_ipalib/test_frontend.py @@ -862,13 +862,13 @@ class test_LocalOrRemote(ClassChecker): api.finalize() cmd = api.Command.example assert cmd(version=u'2.47') == dict( - result=('execute', (None,), dict(version=u'2.47', server=False)) + result=('execute', (), dict(version=u'2.47')) ) assert cmd(u'var', version=u'2.47') == dict( - result=('execute', (u'var',), dict(version=u'2.47', server=False)) + result=('execute', (u'var',), dict(version=u'2.47')) ) assert cmd(server=True, version=u'2.47') == dict( - result=('forward', (None,), dict(version=u'2.47', server=True)) + result=('forward', (), dict(version=u'2.47', server=True)) ) assert cmd(u'var', server=True, version=u'2.47') == dict( result=('forward', (u'var',), dict(version=u'2.47', server=True)) @@ -880,13 +880,13 @@ class test_LocalOrRemote(ClassChecker): api.finalize() cmd = api.Command.example assert cmd(version=u'2.47') == dict( - result=('execute', (None,), dict(version=u'2.47', server=False)) + result=('execute', (), dict(version=u'2.47', server=False)) ) assert cmd(u'var', version=u'2.47') == dict( result=('execute', (u'var',), dict(version=u'2.47', server=False)) ) assert cmd(server=True, version=u'2.47') == dict( - result=('execute', (None,), dict(version=u'2.47', server=True)) + result=('execute', (), dict(version=u'2.47', server=True)) ) assert cmd(u'var', server=True, version=u'2.47') == dict( result=('execute', (u'var',), dict(version=u'2.47', server=True)) @@ -1106,7 +1106,7 @@ class test_Attribute(ClassChecker): """ user_obj = 'The user frontend.Object instance' class api(object): - Object = dict(user=user_obj) + Object = {("user", "1"): user_obj} @staticmethod def is_production_mode(): return False