Imported Debian patch 4.0.5-6~numeezy

ipatests/test_xmlrpc/test_role_plugin.py

@@ -24,10 +24,8 @@ Test the `ipalib/plugins/role.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from xmlrpc_test import Declarative, fuzzy_digits, fuzzy_uuid
 from ipapython.dn import DN
-import pytest
 
 search = u'test-role'
 
@@ -49,8 +47,6 @@ privilege1 = u'r,w privilege 1'
 privilege1_dn = DN(('cn', privilege1), DN(api.env.container_privilege),
                    api.env.basedn)
 
-
-@pytest.mark.tier1
 class test_role(Declarative):
 
     cleanup_commands = [
@@ -261,7 +257,6 @@ class test_role(Declarative):
                         group=[],
                         host=[],
                         hostgroup=[],
-                        service=[],
                     ),
                 ),
                 result={
@@ -441,7 +436,6 @@ class test_role(Declarative):
                         group=[],
                         host=[],
                         hostgroup=[],
-                        service=[],
                     ),
                 ),
                 result={