oeqa/oelib/path: don't leak temporary directories

PATCH New Ross Burton 1 participant 1 message Dec 3, 2018

Share & tools

Ross Burton

author

2018-12-03 11:48 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Ross Burton <[email protected]>

---
 meta/lib/oeqa/selftest/cases/oelib/path.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

meta/lib/oeqa/selftest/cases/oelib/path.py +3 -7

index 75a27c06f77..e0eb8134a90 100644
@@ -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)

Signature · 1 line

2.11.0