diff options
author | Petr Viktorin <pviktori@redhat.com> | 2012-03-28 04:42:23 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-04-01 16:21:10 -0400 |
commit | 8c1171e9234f055fe44313077528ee7491156146 (patch) | |
tree | 8380c0e4d82ae904477baac80a9e2b135a0c5da2 /tests/test_xmlrpc/xmlrpc_test.py | |
parent | 16b38d39b36eb0b39a77720e30ac4321e902e66b (diff) | |
download | freeipa.git-8c1171e9234f055fe44313077528ee7491156146.tar.gz freeipa.git-8c1171e9234f055fe44313077528ee7491156146.tar.xz freeipa.git-8c1171e9234f055fe44313077528ee7491156146.zip |
Move test skipping to class setup
Currently, each DNS test case first checks if DNS is configured
by creating and deleting a test zone. This takes quite a lot of time.
This patch moves the check to the setUpClass method, so the check is
only done once for all the tests.
Similarly, if the server is not available, entire XMLRPC test classes
are now skipped.
Additionally, CLItests that hit the server are skipped if the server
isn't available.
Diffstat (limited to 'tests/test_xmlrpc/xmlrpc_test.py')
-rw-r--r-- | tests/test_xmlrpc/xmlrpc_test.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py index a7cfb11b..28f5fac7 100644 --- a/tests/test_xmlrpc/xmlrpc_test.py +++ b/tests/test_xmlrpc/xmlrpc_test.py @@ -122,11 +122,13 @@ class XMLRPC_test(object): Base class for all XML-RPC plugin tests """ - def setUp(self): + @classmethod + def setUpClass(cls): if not server_available: - raise nose.SkipTest( - 'Server not available: %r' % api.env.xmlrpc_uri - ) + raise nose.SkipTest('%r: Server not available: %r' % + (cls.__module__, api.env.xmlrpc_uri)) + + def setUp(self): if not api.Backend.xmlclient.isconnected(): api.Backend.xmlclient.connect(fallback=False) |