git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13545d7
)
s4-test: Remove metadata and ldb.d directory on clean up
author
Amitay Isaacs
<amitay@gmail.com>
Tue, 29 Nov 2011 00:15:05 +0000
(11:15 +1100)
committer
Amitay Isaacs
<amitay@gmail.com>
Tue, 29 Nov 2011 05:00:36 +0000
(16:00 +1100)
When using partitions, metadata.tdb automatically gets created in
${prefix}ldb.d/ directory. To correctly clean up check if metadata.tdb
exists, then remove metadata.tdb and directory.
source4/scripting/python/samba/tests/samba3sam.py
patch
|
blob
|
history
diff --git
a/source4/scripting/python/samba/tests/samba3sam.py
b/source4/scripting/python/samba/tests/samba3sam.py
index 63c9a4c1f4da44d55ac321b6ab8070905bea4a22..6b9ce7b3d43c533eef3902f14393a2e059778278 100644
(file)
--- a/
source4/scripting/python/samba/tests/samba3sam.py
+++ b/
source4/scripting/python/samba/tests/samba3sam.py
@@
-122,6
+122,11
@@
class MapBaseTestCase(TestCaseInTempDir):
os.unlink(self.ldbfile)
os.unlink(self.samba3.file)
os.unlink(self.samba4.file)
+ pdir = "%s.d" % self.ldbfile
+ mdata = os.path.join(pdir, "metadata.tdb")
+ if os.path.exists(mdata):
+ os.unlink(mdata)
+ os.rmdir(pdir)
super(MapBaseTestCase, self).tearDown()
def assertSidEquals(self, text, ndr_sid):