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

@@ -25,9 +25,7 @@ import nose
from ipalib import api
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
fuzzy_user_or_group_sid)
import pytest
from xmlrpc_test import Declarative, fuzzy_uuid, fuzzy_user_or_group_sid
group_name = u'external_group'
group_desc = u'Test external group'
@@ -43,11 +41,10 @@ def get_trusted_group_name():
return u'%s\Domain Admins' % ad_netbios
@pytest.mark.tier1
class test_external_members(Declarative):
@classmethod
def setup_class(cls):
super(test_external_members, cls).setup_class()
def setUpClass(cls):
super(test_external_members, cls).setUpClass()
if not api.Backend.rpcclient.isconnected():
api.Backend.rpcclient.connect(fallback=False)