Imported Debian patch 4.0.5-6~numeezy

This commit is contained in:
Alexandre Ellert
2016-02-17 15:07:45 +01:00
committed by Mario Fetka
parent c44de33144
commit 10dfc9587b
1203 changed files with 53869 additions and 241462 deletions

View File

@@ -27,10 +27,8 @@ http://www.freeipa.org/page/V3/Permissions_V2
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
permission1 = u'testperm'
permission1_dn = DN(('cn',permission1),
@@ -78,8 +76,6 @@ permission3_attributelevelrights = {
'ipapermright': u'rscwo',
'ipapermtarget': u'rscwo',
'ipapermtargetfilter': u'rscwo',
'ipapermtargetto': u'rscwo',
'ipapermtargetfrom': u'rscwo',
}
privilege1 = u'testpriv1'
@@ -92,8 +88,6 @@ users_dn = DN(api.env.container_user, api.env.basedn)
groups_dn = DN(api.env.container_group, api.env.basedn)
hbac_dn = DN(api.env.container_hbac, api.env.basedn)
@pytest.mark.tier1
class test_old_permission(Declarative):
default_version = u'2.65'
@@ -525,13 +519,6 @@ class test_old_permission(Declarative):
'subtree': u'ldap:///%s' % users_dn,
},
],
messages=({
'message': (u'Search result has been truncated to '
'configured search limit.'),
'code': 13017,
'type': u'warning',
'name': u'SearchResultTruncated'
},),
),
),
@@ -585,13 +572,6 @@ class test_old_permission(Declarative):
DN(res['dn']).endswith(DN(api.env.container_permission,
api.env.basedn)) and
'ipapermission' in res['objectclass']],
messages=({
'message': (u'Search result has been truncated to '
'configured search limit.'),
'code': 13017,
'type': u'warning',
'name': u'SearchResultTruncated'
},),
),
),
@@ -1048,7 +1028,7 @@ class test_old_permission(Declarative):
'permission_add', [permission3], dict(
type=u'user',
permissions=u'write',
attrs=[u'cn']
attrs=[u'cn']
)
),
expected=dict(
@@ -1075,7 +1055,7 @@ class test_old_permission(Declarative):
value=permission3,
summary=None,
result=dict(
dn=permission3_dn,
dn=permission3_dn,
cn=[permission3],
objectclass=objectclasses.permission,
type=u'user',
@@ -1098,7 +1078,7 @@ class test_old_permission(Declarative):
value=permission3,
summary=u'Modified permission "%s"' % permission3,
result=dict(
dn=permission3_dn,
dn=permission3_dn,
cn=[permission3],
objectclass=objectclasses.permission,
type=u'user',