From 56c66f44a0e356504bf8a7edcc924777adc1b352 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Wed, 25 May 2016 12:31:03 +0200 Subject: rpc: specify connection options in API config Specify RPC connection options once in API.bootstrap rather than in each invocation of rpcclient.connect. https://fedorahosted.org/freeipa/ticket/4739 Reviewed-By: David Kupka --- ipatests/test_xmlrpc/test_dns_plugin.py | 12 ++++++------ ipatests/test_xmlrpc/test_external_members.py | 2 +- ipatests/test_xmlrpc/test_trust_plugin.py | 2 +- ipatests/test_xmlrpc/test_vault_plugin.py | 2 +- ipatests/test_xmlrpc/xmlrpc_test.py | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ipatests/test_xmlrpc') diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index 7351d0b1d..dbc3bae37 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -429,7 +429,7 @@ class test_dns(Declarative): super(test_dns, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not have_ldap2: raise nose.SkipTest('server plugin not available') @@ -3163,7 +3163,7 @@ class test_root_zone(Declarative): super(test_root_zone, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not have_ldap2: raise nose.SkipTest('server plugin not available') @@ -3246,7 +3246,7 @@ class test_forward_zones(Declarative): super(test_forward_zones, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not have_ldap2: raise nose.SkipTest('server plugin not available') @@ -4463,7 +4463,7 @@ class test_forward_master_zones_mutual_exlusion(Declarative): super(test_forward_master_zones_mutual_exlusion, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not have_ldap2: raise nose.SkipTest('server plugin not available') @@ -4838,7 +4838,7 @@ class test_forwardzone_delegation_warnings(Declarative): super(test_forwardzone_delegation_warnings, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not have_ldap2: raise nose.SkipTest('server plugin not available') @@ -5349,7 +5349,7 @@ class test_dns_soa(Declarative): super(test_dns_soa, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not have_ldap2: raise nose.SkipTest('server plugin not available') diff --git a/ipatests/test_xmlrpc/test_external_members.py b/ipatests/test_xmlrpc/test_external_members.py index 8e9d38729..9d1f240ac 100644 --- a/ipatests/test_xmlrpc/test_external_members.py +++ b/ipatests/test_xmlrpc/test_external_members.py @@ -49,7 +49,7 @@ class test_external_members(Declarative): def setup_class(cls): super(test_external_members, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() trusts = api.Command['trust_find']() if trusts['count'] == 0: diff --git a/ipatests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py index 54ac96737..0427ed151 100644 --- a/ipatests/test_xmlrpc/test_trust_plugin.py +++ b/ipatests/test_xmlrpc/test_trust_plugin.py @@ -51,7 +51,7 @@ class test_trustconfig(Declarative): def setup_class(cls): super(test_trustconfig, cls).setup_class() if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() try: api.Command['trustconfig_show'](trust_type=u'ad') except errors.NotFound: diff --git a/ipatests/test_xmlrpc/test_vault_plugin.py b/ipatests/test_xmlrpc/test_vault_plugin.py index c8d778583..932185f86 100644 --- a/ipatests/test_xmlrpc/test_vault_plugin.py +++ b/ipatests/test_xmlrpc/test_vault_plugin.py @@ -131,7 +131,7 @@ class test_vault_plugin(Declarative): @classmethod def setup_class(cls): if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() if not api.Command.kra_is_enabled()['result']: raise nose.SkipTest('KRA service is not enabled') diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py index 4052ab918..0e326e1fa 100644 --- a/ipatests/test_xmlrpc/xmlrpc_test.py +++ b/ipatests/test_xmlrpc/xmlrpc_test.py @@ -111,7 +111,7 @@ def fuzzy_set_ci(s): try: if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() res = api.Command['user_show'](u'notfound') except errors.NetworkError: server_available = False @@ -186,7 +186,7 @@ class XMLRPC_test(object): raise nose.SkipTest('%r: Server not available: %r' % (cls.__module__, api.env.xmlrpc_uri)) if not api.Backend.rpcclient.isconnected(): - api.Backend.rpcclient.connect(fallback=False) + api.Backend.rpcclient.connect() @classmethod def teardown_class(cls): -- cgit