Mostly got the test_xmlrpc/ tests working again

8 files changed, 14 insertions, 41 deletions

diff --git a/tests/test_xmlrpc/test_automount_plugin.py b/tests/test_xmlrpc/test_automount_plugin.py
index 529e7aead..9de53ea1e 100644
--- a/tests/test_xmlrpc/test_automount_plugin.py
+++ b/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):
     """
diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py
index 4b9e6bbf1..48cb3c97f 100644
--- a/tests/test_xmlrpc/test_group_plugin.py
+++ b/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):
     """
diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py
index 9cd6cf839..f9e4108ee 100644
--- a/tests/test_xmlrpc/test_host_plugin.py
+++ b/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):
     """
diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/tests/test_xmlrpc/test_hostgroup_plugin.py
index ecc61ef72..1f1a5f3d1 100644
--- a/tests/test_xmlrpc/test_hostgroup_plugin.py
+++ b/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):
     """
diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py
index 54b7eb97f..056ee0056 100644
--- a/tests/test_xmlrpc/test_netgroup_plugin.py
+++ b/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):
diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py
index 33dc7b747..ca5d7e01e 100644
--- a/tests/test_xmlrpc/test_service_plugin.py
+++ b/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):
     """
diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index a89e4d669..72b5e808b 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/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):
     """
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py
index 74e6157fb..08f7eab89 100644
--- a/tests/test_xmlrpc/xmlrpc_test.py
+++ b/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 errors
+from ipalib import api, request
+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')
-        except socket.error:
-            raise nose.SkipTest
+            if not api.Backend.xmlclient.isconnected():
+                api.Backend.xmlclient.connect()
+            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()