diff options
Diffstat (limited to 'ipatests')
-rw-r--r-- | ipatests/test_cmdline/test_cli.py | 4 | ||||
-rw-r--r-- | ipatests/test_ipaserver/test_rpcserver.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_dns_plugin.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_external_members.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_trust_plugin.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/xmlrpc_test.py | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py index 4c76e181..489d2ceb 100644 --- a/ipatests/test_cmdline/test_cli.py +++ b/ipatests/test_cmdline/test_cli.py @@ -25,8 +25,8 @@ class TestCLIParsing(object): def run_command(self, command_name, **kw): """Run a command on the server""" - if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect(fallback=False) + if not api.Backend.rpcclient.isconnected(): + api.Backend.rpcclient.connect(fallback=False) try: api.Command[command_name](**kw) except errors.NetworkError: diff --git a/ipatests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py index bd567384..08d773c3 100644 --- a/ipatests/test_ipaserver/test_rpcserver.py +++ b/ipatests/test_ipaserver/test_rpcserver.py @@ -241,7 +241,7 @@ class test_jsonserver(PluginTester): assert unicode(e.error) == 'params[1] (aka options) must be a dict' # Test with valid values: - args = [u'jdoe'] + args = (u'jdoe', ) options = dict(givenname=u'John', sn='Doe') - d = dict(method=u'user_add', params=[args, options], id=18) + d = dict(method=u'user_add', params=(args, options), id=18) assert o.unmarshal(json.dumps(d)) == (u'user_add', args, options, 18) diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py index 1bfaee71..81e8e4ed 100644 --- a/ipatests/test_xmlrpc/test_dns_plugin.py +++ b/ipatests/test_xmlrpc/test_dns_plugin.py @@ -63,8 +63,8 @@ class test_dns(Declarative): def setUpClass(cls): super(test_dns, cls).setUpClass() - if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect(fallback=False) + if not api.Backend.rpcclient.isconnected(): + api.Backend.rpcclient.connect(fallback=False) try: api.Command['dnszone_add'](dnszone1, idnssoamname = dnszone1_mname, diff --git a/ipatests/test_xmlrpc/test_external_members.py b/ipatests/test_xmlrpc/test_external_members.py index 112470dc..a2128cb7 100644 --- a/ipatests/test_xmlrpc/test_external_members.py +++ b/ipatests/test_xmlrpc/test_external_members.py @@ -45,8 +45,8 @@ class test_external_members(Declarative): @classmethod def setUpClass(cls): super(test_external_members, cls).setUpClass() - if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect(fallback=False) + if not api.Backend.rpcclient.isconnected(): + api.Backend.rpcclient.connect(fallback=False) 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 0223e8b3..5260b406 100644 --- a/ipatests/test_xmlrpc/test_trust_plugin.py +++ b/ipatests/test_xmlrpc/test_trust_plugin.py @@ -41,8 +41,8 @@ class test_trustconfig(Declarative): @classmethod def setUpClass(cls): super(test_trustconfig, cls).setUpClass() - if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect(fallback=False) + if not api.Backend.rpcclient.isconnected(): + api.Backend.rpcclient.connect(fallback=False) try: api.Command['trustconfig_show'](trust_type=u'ad') except errors.NotFound: diff --git a/ipatests/test_xmlrpc/xmlrpc_test.py b/ipatests/test_xmlrpc/xmlrpc_test.py index 2d12bcb3..04d69475 100644 --- a/ipatests/test_xmlrpc/xmlrpc_test.py +++ b/ipatests/test_xmlrpc/xmlrpc_test.py @@ -86,8 +86,8 @@ def fuzzy_set_ci(s): return Fuzzy(test=lambda other: set(x.lower() for x in other) == set(y.lower() for y in s)) try: - if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect(fallback=False) + if not api.Backend.rpcclient.isconnected(): + api.Backend.rpcclient.connect(fallback=False) res = api.Command['user_show'](u'notfound') except errors.NetworkError: server_available = False @@ -163,8 +163,8 @@ class XMLRPC_test(object): (cls.__module__, api.env.xmlrpc_uri)) def setUp(self): - if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect(fallback=False) + if not api.Backend.rpcclient.isconnected(): + api.Backend.rpcclient.connect(fallback=False) def tearDown(self): """ |