mirror of
https://git.yoctoproject.org/poky
synced 2026-04-13 14:02:21 +02:00
oeqa/oelib/path: don't leak temporary directories
setUp() is used to populate a directory of temporary files, and deleted in __del__. However setUp() is called once *per test* so __del__ would only be able to remove the last directory created. Fix the code by using the natural counterpart to setUp, tearDown(), to clean up. (From OE-Core rev: 68b4723e6fb11d171869185bccf28f32f6284c18) (From OE-Core rev: eee30d799ff892443d21de4128e7d643215b0ac1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3c27f3b3a7
commit
72d7b5b5d4
@@ -38,13 +38,6 @@ class TestRealPath(TestCase):
|
||||
( "b/test", errno.ENOENT ),
|
||||
]
|
||||
|
||||
def __del__(self):
|
||||
try:
|
||||
#os.system("tree -F %s" % self.tmpdir)
|
||||
shutil.rmtree(self.tmpdir)
|
||||
except:
|
||||
pass
|
||||
|
||||
def setUp(self):
|
||||
self.tmpdir = tempfile.mkdtemp(prefix = "oe-test_path")
|
||||
self.root = os.path.join(self.tmpdir, "R")
|
||||
@@ -59,6 +52,9 @@ class TestRealPath(TestCase):
|
||||
for l in self.LINKS:
|
||||
os.symlink(l[1], os.path.join(self.root, l[0]))
|
||||
|
||||
def tearDown(self):
|
||||
shutil.rmtree(self.tmpdir)
|
||||
|
||||
def __realpath(self, file, use_physdir, assume_dir = True):
|
||||
return oe.path.realpath(os.path.join(self.root, file), self.root,
|
||||
use_physdir, assume_dir = assume_dir)
|
||||
|
||||
Reference in New Issue
Block a user