From 459a7c7de6eeb536684d801b79e3022fc20bdd4a Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Sun, 28 Dec 2014 04:23:33 +0200 Subject: [PATCH] s4-dsdb/tests: Do not pre-create LoadParm - connect_samdb_env() will handle it Change-Id: I3483c5aa50de2f7aca19e4d7cc4fa49bbe5f889d Signed-off-by: Kamen Mazdrashki Reviewed-by: Andrew Bartlett Reviewed-by: Garming Sam --- source4/dsdb/tests/python/tombstone_reanimation.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py index 807cfeec3c3..c049661612d 100644 --- a/source4/dsdb/tests/python/tombstone_reanimation.py +++ b/source4/dsdb/tests/python/tombstone_reanimation.py @@ -19,14 +19,12 @@ # along with this program. If not, see . import sys -import optparse import unittest sys.path.insert(0, "bin/python") import samba import samba.tests -import samba.getopt as options from ldb import (SCOPE_BASE, FLAG_MOD_ADD, FLAG_MOD_DELETE, FLAG_MOD_REPLACE, Dn, Message, MessageElement, LdbError, ERR_ATTRIBUTE_OR_VALUE_EXISTS, ERR_NO_SUCH_OBJECT, ERR_ENTRY_ALREADY_EXISTS, @@ -40,9 +38,7 @@ class RestoredObjectAttributesBaseTestCase(samba.tests.TestCase): def setUp(self): super(RestoredObjectAttributesBaseTestCase, self).setUp() - # load LoadParm - lp = options.SambaOptions(optparse.OptionParser()).get_loadparm() - self.samdb = samba.tests.connect_samdb_env("TEST_SERVER", "TEST_USERNAME", "TEST_PASSWORD", lp=lp) + self.samdb = samba.tests.connect_samdb_env("TEST_SERVER", "TEST_USERNAME", "TEST_PASSWORD") self.base_dn = self.samdb.domain_dn() self.schema_dn = self.samdb.get_schema_basedn().get_linearized() self.configuration_dn = self.samdb.get_config_basedn().get_linearized() -- 2.11.4.GIT