From c86bf80abd87acb0da5860806822c64ec9dee089 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 12 Aug 2016 14:35:54 +0300 Subject: oeqa.buildperf: use oe.path.remove() Drop the self-baked force_rm() method. Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton --- meta/lib/oeqa/buildperf/base.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'meta/lib/oeqa/buildperf/base.py') diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index fe18181f2b..c1dc86e5db 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -23,6 +23,7 @@ import unittest from datetime import datetime, timedelta from functools import partial +import oe.path from oeqa.utils.commands import CommandError, runCmd, get_bb_vars from oeqa.utils.git import GitError, GitRepo @@ -297,29 +298,21 @@ class BuildPerfTestCase(unittest.TestCase): shutil.move(self.bb_vars['BUILDSTATS_BASE'], os.path.join(self.out_dir, 'buildstats-' + self.name)) - @staticmethod - def force_rm(path): - """Equivalent of 'rm -rf'""" - if os.path.isfile(path) or os.path.islink(path): - os.unlink(path) - elif os.path.isdir(path): - shutil.rmtree(path) - def rm_tmp(self): """Cleanup temporary/intermediate files and directories""" log.debug("Removing temporary and cache files") for name in ['bitbake.lock', 'conf/sanity_info', self.bb_vars['TMPDIR']]: - self.force_rm(name) + oe.path.remove(name, recurse=True) def rm_sstate(self): """Remove sstate directory""" log.debug("Removing sstate-cache") - self.force_rm(self.bb_vars['SSTATE_DIR']) + oe.path.remove(self.bb_vars['SSTATE_DIR'], recurse=True) def rm_cache(self): """Drop bitbake caches""" - self.force_rm(self.bb_vars['PERSISTENT_DIR']) + oe.path.remove(self.bb_vars['PERSISTENT_DIR'], recurse=True) @staticmethod def sync(): -- cgit v1.2.3