Imported Debian patch 4.7.2-3

ipatests/test_xmlrpc/test_trust_plugin.py

@@ -20,6 +20,8 @@
 Test the `ipaserver/plugins/trust.py` module.
 """
 
+import unittest
+
 import six
 
 from ipalib import api, errors
@@ -45,14 +47,16 @@ default_group_dn = DN(('cn', default_group), api.env.container_group, api.env.ba
 
 @pytest.mark.tier1
 class test_trustconfig(Declarative):
-    @pytest.fixture(autouse=True, scope="class")
-    def trustconfig_setup(self, declarative_setup):
+
+    @classmethod
+    def setup_class(cls):
+        super(test_trustconfig, cls).setup_class()
         if not api.Backend.rpcclient.isconnected():
             api.Backend.rpcclient.connect()
         try:
            api.Command['trustconfig_show'](trust_type=u'ad')
         except errors.NotFound:
-            pytest.skip('Trusts are not configured')
+            raise unittest.SkipTest('Trusts are not configured')
 
     cleanup_commands = [
         ('group_del', [testgroup], {}),