From 1df10a88cd8b36be8b9b4d47c49dd9e7d1d12bc0 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 26 Jul 2010 17:54:38 -0400 Subject: Add support for client failover to the ipa command-line. This adds a new global option to the ipa command, -f/--no-fallback. If this is included then just the server configured in /etc/ipa/default.conf is used. Otherwise that is tried first then all servers in DNS with the ldap SRV record are tried. Create a new Local() Command class for local-only commands. The help command is one of these. It shouldn't need a remote connection to execute. ticket #15 --- tests/test_ipalib/test_rpc.py | 2 +- tests/test_xmlrpc/xmlrpc_test.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test_ipalib/test_rpc.py b/tests/test_ipalib/test_rpc.py index 315523b7f..6c1bde48d 100644 --- a/tests/test_ipalib/test_rpc.py +++ b/tests/test_ipalib/test_rpc.py @@ -234,7 +234,7 @@ class test_xmlclient(PluginTester): # Test with an errno the client knows: e = raises(errors.RequirementError, o.forward, 'user_add', *args, **kw) - assert_equal(e.message, u"'four' is required") + assert_equal(e.args[0], u"'four' is required") # Test with an errno the client doesn't know e = raises(errors.UnknownError, o.forward, 'user_add', *args, **kw) diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py index 1966edf93..1e41bc4e6 100644 --- a/tests/test_xmlrpc/xmlrpc_test.py +++ b/tests/test_xmlrpc/xmlrpc_test.py @@ -42,7 +42,7 @@ fuzzy_uuid = Fuzzy( try: if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect() + api.Backend.xmlclient.connect(fallback=False) res = api.Command['user_show'](u'notfound') except errors.NetworkError: server_available = False @@ -103,7 +103,7 @@ class XMLRPC_test(object): 'Server not available: %r' % api.env.xmlrpc_uri ) if not api.Backend.xmlclient.isconnected(): - api.Backend.xmlclient.connect() + api.Backend.xmlclient.connect(fallback=False) def tearDown(self): """ -- cgit