Imported Debian patch 4.0.5-6~numeezy
This commit is contained in:
committed by
Mario Fetka
parent
c44de33144
commit
10dfc9587b
@@ -21,18 +21,11 @@ Test the `ipalib/plugins/trust.py` module.
|
||||
"""
|
||||
|
||||
import nose
|
||||
import six
|
||||
|
||||
from ipalib import api, errors
|
||||
from ipapython.dn import DN
|
||||
from ipatests.test_xmlrpc import objectclasses
|
||||
from ipatests.test_xmlrpc.xmlrpc_test import (
|
||||
Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string, fuzzy_uuid,
|
||||
fuzzy_digits)
|
||||
import pytest
|
||||
|
||||
if six.PY3:
|
||||
unicode = str
|
||||
from xmlrpc_test import (Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string,
|
||||
fuzzy_uuid, fuzzy_digits)
|
||||
|
||||
|
||||
trustconfig_ad_config = DN(('cn', api.env.domain),
|
||||
@@ -43,13 +36,11 @@ testgroup_dn = DN(('cn', testgroup), api.env.container_group, api.env.basedn)
|
||||
default_group = u'Default SMB Group'
|
||||
default_group_dn = DN(('cn', default_group), api.env.container_group, api.env.basedn)
|
||||
|
||||
|
||||
@pytest.mark.tier1
|
||||
class test_trustconfig(Declarative):
|
||||
|
||||
@classmethod
|
||||
def setup_class(cls):
|
||||
super(test_trustconfig, cls).setup_class()
|
||||
def setUpClass(cls):
|
||||
super(test_trustconfig, cls).setUpClass()
|
||||
if not api.Backend.rpcclient.isconnected():
|
||||
api.Backend.rpcclient.connect(fallback=False)
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user