Mostly got the test_xmlrpc/ tests working again

ipalib/__init__.py

@@ -870,6 +870,7 @@ freeIPA.org:
 
 '''
 
+import os
 import plugable
 from backend import Backend
 from frontend import Command, LocalOrRemote, Application
@@ -908,7 +909,11 @@ def create_api(mode='dummy'):
     )
     if mode is not None:
         api.env.mode = mode
+    assert mode != 'production'
     return api
 
-
 api = create_api(mode=None)
+
+if os.environ.get('IPA_UNIT_TEST_MODE', None) == 'cli_test':
+    api.bootstrap(context='cli', in_server=False)
+    api.finalize()

ipaserver/mod_python_xmlrpc.py

@@ -28,6 +28,7 @@ Production XML-RPC server using mod_python.
 """
 
 import sys
+import os
 
 
 import time

make-test

@@ -2,6 +2,7 @@
 
 # Script to run nosetests under multiple versions of Python
 
+export IPA_UNIT_TEST_MODE="cli_test"
 versions="python2.4 python2.5 python2.6"
 
 for name in $versions

tests/test_xmlrpc/test_automount_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 class test_Service(XMLRPC_test):
     """

tests/test_xmlrpc/test_group_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 class test_Group(XMLRPC_test):
     """

tests/test_xmlrpc/test_host_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 class test_Host(XMLRPC_test):
     """

tests/test_xmlrpc/test_hostgroup_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 class test_Host(XMLRPC_test):
     """

tests/test_xmlrpc/test_netgroup_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 def is_member_of(members, candidate):
     if not isinstance(members, list):

tests/test_xmlrpc/test_service_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 class test_Service(XMLRPC_test):
     """

tests/test_xmlrpc/test_user_plugin.py

@@ -26,10 +26,6 @@ from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
 class test_User(XMLRPC_test):
     """

tests/test_xmlrpc/xmlrpc_test.py

@@ -24,26 +24,27 @@ Base class for all XML-RPC tests
 import sys
 import socket
 import nose
-from ipalib import api
+from ipalib import api, request
-from ipalib import errors
+from ipalib import errors, errors2
 
-try:
-    api.finalize()
-except StandardError:
-    pass
 
-class XMLRPC_test:
+class XMLRPC_test(object):
     """
     Base class for all XML-RPC plugin tests
     """
 
     def setUp(self):
-        # FIXME: changing Plugin.name from a property to an instance attribute
-        # somehow broke this.
-        raise nose.SkipTest
         try:
-            res = api.Command['user_show']('notfound')
+            if not api.Backend.xmlclient.isconnected():
-        except socket.error:
+                api.Backend.xmlclient.connect()
-            raise nose.SkipTest
+            res = api.Command['user_show'](u'notfound')
+        except errors2.NetworkError:
+            raise nose.SkipTest()
         except errors.NotFound:
             pass
+
+    def tearDown(self):
+        """
+        nose tear-down fixture.
+        """
+        request.destroy_context()