perf tests: Move attr.py temp dir cleanup into finally section
Currently if there's 'Unsup' exception raised, we do not clean up the temp directory. Solving this by adding 'finally' to make the cleanup in any case. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1352390461-15404-1-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
580e338d7e
Коммит
d4fcf0a8b9
|
@ -228,24 +228,26 @@ class Test(object):
|
|||
def run(self):
|
||||
tempdir = tempfile.mkdtemp();
|
||||
|
||||
# run the test script
|
||||
self.run_cmd(tempdir);
|
||||
try:
|
||||
# run the test script
|
||||
self.run_cmd(tempdir);
|
||||
|
||||
# load events expectation for the test
|
||||
log.info(" loading result events");
|
||||
for f in glob.glob(tempdir + '/event*'):
|
||||
self.load_events(f, self.result);
|
||||
# load events expectation for the test
|
||||
log.info(" loading result events");
|
||||
for f in glob.glob(tempdir + '/event*'):
|
||||
self.load_events(f, self.result);
|
||||
|
||||
# resolve group_fd to event names
|
||||
self.resolve_groups(self.expect);
|
||||
self.resolve_groups(self.result);
|
||||
# resolve group_fd to event names
|
||||
self.resolve_groups(self.expect);
|
||||
self.resolve_groups(self.result);
|
||||
|
||||
# do the expectation - results matching - both ways
|
||||
self.compare(self.expect, self.result)
|
||||
self.compare(self.result, self.expect)
|
||||
# do the expectation - results matching - both ways
|
||||
self.compare(self.expect, self.result)
|
||||
self.compare(self.result, self.expect)
|
||||
|
||||
# cleanup
|
||||
shutil.rmtree(tempdir)
|
||||
finally:
|
||||
# cleanup
|
||||
shutil.rmtree(tempdir)
|
||||
|
||||
|
||||
def run_tests(options):
|
||||
|
|
Загрузка…
Ссылка в новой задаче