summaryrefslogtreecommitdiffstats
path: root/source4/dsdb
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2014-12-28 04:23:33 +0200
committerAndrew Bartlett <abartlet@samba.org>2015-02-03 05:02:12 +0100
commit459a7c7de6eeb536684d801b79e3022fc20bdd4a (patch)
tree30d10a8f1713d8a5f0991346771980ecf371140b /source4/dsdb
parent2ad50f8842c33fb90570e469dfb54df2bff1195c (diff)
downloadsamba-459a7c7de6eeb536684d801b79e3022fc20bdd4a.tar.gz
samba-459a7c7de6eeb536684d801b79e3022fc20bdd4a.tar.xz
samba-459a7c7de6eeb536684d801b79e3022fc20bdd4a.zip
s4-dsdb/tests: Do not pre-create LoadParm - connect_samdb_env() will handle it
Change-Id: I3483c5aa50de2f7aca19e4d7cc4fa49bbe5f889d Signed-off-by: Kamen Mazdrashki <kamenim@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/tests/python/tombstone_reanimation.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/dsdb/tests/python/tombstone_reanimation.py b/source4/dsdb/tests/python/tombstone_reanimation.py
index 807cfeec3c..c049661612 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 <http://www.gnu.org/licenses/>.
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()