tests dsdb: load paramaters from test environment
authorGary Lockyer <gary@catalyst.net.nz>
Mon, 3 Apr 2017 20:56:47 +0000 (08:56 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 6 Apr 2017 08:06:04 +0000 (10:06 +0200)
Load the test environment specific parameters

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Apr  6 10:06:05 CEST 2017 on sn-devel-144

python/samba/tests/dsdb.py

index a3b94fbe20675d093f51f4e3290a3cdd2c558041..4a34bacb73fd99a470d0e02ffac351934ab5abcb 100644 (file)
@@ -32,16 +32,13 @@ class DsdbTests(TestCase):
 
     def setUp(self):
         super(DsdbTests, self).setUp()
-        self.lp = samba.param.LoadParm()
-        self.lp.load(os.path.join(os.path.join(self.baseprovpath(), "etc"), "smb.conf"))
+        self.lp = samba.tests.env_loadparm()
         self.creds = Credentials()
         self.creds.guess(self.lp)
         self.session = system_session()
-        self.samdb = SamDB(os.path.join(self.baseprovpath(), "private", "sam.ldb"),
-            session_info=self.session, credentials=self.creds,lp=self.lp)
-
-    def baseprovpath(self):
-        return os.path.join(os.environ['SELFTEST_PREFIX'], "ad_dc_ntvfs")
+        self.samdb = SamDB(session_info=self.session,
+                           credentials=self.creds,
+                           lp=self.lp)
 
     def test_get_oid_from_attrid(self):
         oid = self.samdb.get_oid_from_attid(591614)