Skip tests if the remote XML-RPC server is not responding.

4 files changed, 53 insertions, 3 deletions

diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py
index 02372e05a..7ac88f294 100644
--- a/tests/test_xmlrpc/test_group_plugin.py
+++ b/tests/test_xmlrpc/test_group_plugin.py
@@ -22,6 +22,7 @@ Test the `ipalib/plugins/f_group` module.
 """
 
 import sys
+from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 from ipalib.cli import CLI
@@ -31,7 +32,7 @@ try:
 except StandardError:
     pass
 
-class test_Group:
+class test_Group(XMLRPC_test):
     """
     Test the `f_group` plugin.
     """
diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py
index 4ca298765..0a843d36e 100644
--- a/tests/test_xmlrpc/test_service_plugin.py
+++ b/tests/test_xmlrpc/test_service_plugin.py
@@ -22,6 +22,7 @@ Test the `ipalib/plugins/f_service` module.
 """
 
 import sys
+from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 from ipalib.cli import CLI
@@ -31,7 +32,7 @@ try:
 except StandardError:
     pass
 
-class test_Service:
+class test_Service(XMLRPC_test):
     """
     Test the `f_service` plugin.
     """
diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index af646ebbb..6353d0b46 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/tests/test_xmlrpc/test_user_plugin.py
@@ -22,6 +22,7 @@ Test the `ipalib/plugins/f_user` module.
 """
 
 import sys
+from xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 from ipalib.cli import CLI
@@ -31,7 +32,7 @@ try:
 except StandardError:
     pass
 
-class test_User:
+class test_User(XMLRPC_test):
     """
     Test the `f_user` plugin.
     """
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py
new file mode 100644
index 000000000..8e65efb85
--- /dev/null
+++ b/tests/test_xmlrpc/xmlrpc_test.py
@@ -0,0 +1,47 @@
+# Authors:
+#   Rob Crittenden <rcritten@redhat.com>
+#
+# Copyright (C) 2008  Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""
+Base class for all XML-RPC tests
+"""
+
+import sys
+import socket
+import nose
+from ipalib import api
+from ipalib import errors
+from ipalib.cli import CLI
+
+try:
+    api.finalize()
+except StandardError:
+    pass
+
+class XMLRPC_test:
+    """
+    Base class for all XML-RPC plugin tests
+    """
+
+    def setUp(self):
+        try:
+            res = api.Command['user_show']('notfound')
+        except socket.error:
+            raise nose.SkipTest
+        except errors.NotFound:
+            pass