aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-04-27 12:02:33 +0200
committerTibor Frank <tifrank@cisco.com>2018-04-27 12:02:33 +0200
commitf5d0c4d77058099fdd48a161e05c83676b119c2c (patch)
tree65f119c5cf4622a4af6fe2b118682724d5358bd6
parent09b5d7df5081bddc9c5257575e7d79038f37f734 (diff)
Report: delete tmp dir
Change-Id: I6ab1eefa9a53419d47fda829c365ce9fab7db3c3 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--resources/tools/presentation/environment.py5
-rw-r--r--resources/tools/presentation/pal.py82
-rw-r--r--resources/tools/presentation/specification.yaml1
3 files changed, 45 insertions, 43 deletions
diff --git a/resources/tools/presentation/environment.py b/resources/tools/presentation/environment.py
index 05376e0e09..1a1c3db032 100644
--- a/resources/tools/presentation/environment.py
+++ b/resources/tools/presentation/environment.py
@@ -148,8 +148,9 @@ def clean_environment(env):
try:
shutil.rmtree(dir_to_remove)
except OSError:
- raise PresentationError("Cannot remove the directory '{}'".
- format(dir_to_remove))
+ pass
+ # raise PresentationError("Cannot remove the directory '{}'".
+ # format(dir_to_remove))
else:
logging.warning("The directory '{}' does not exist.".
format(dir_to_remove))
diff --git a/resources/tools/presentation/pal.py b/resources/tools/presentation/pal.py
index aaeacaac15..98642c898c 100644
--- a/resources/tools/presentation/pal.py
+++ b/resources/tools/presentation/pal.py
@@ -87,48 +87,48 @@ def main():
return 1
ret_code = 0
- # try:
- env = Environment(spec.environment, args.force)
- env.set_environment()
-
- if spec.is_debug:
- if spec.debug["input-format"] == "zip":
- unzip_files(spec)
- else:
- download_data_files(spec)
-
- prepare_static_content(spec)
-
- data = InputData(spec)
- data.read_data()
-
- generate_tables(spec, data)
- generate_plots(spec, data)
- generate_files(spec, data)
-
- if spec.output["output"] == "report":
- generate_report(args.release, spec)
- logging.info("Successfully finished.")
- elif spec.output["output"] == "CPTA":
- sys.stdout.write(generate_cpta(spec, data))
- logging.info("Successfully finished.")
- else:
- logging.critical("The output '{0}' is not supported.".
- format(spec.output["output"]))
+ try:
+ env = Environment(spec.environment, args.force)
+ env.set_environment()
+
+ if spec.is_debug:
+ if spec.debug["input-format"] == "zip":
+ unzip_files(spec)
+ else:
+ download_data_files(spec)
+
+ prepare_static_content(spec)
+
+ data = InputData(spec)
+ data.read_data()
+
+ generate_tables(spec, data)
+ generate_plots(spec, data)
+ generate_files(spec, data)
+
+ if spec.output["output"] == "report":
+ generate_report(args.release, spec)
+ logging.info("Successfully finished.")
+ elif spec.output["output"] == "CPTA":
+ sys.stdout.write(generate_cpta(spec, data))
+ logging.info("Successfully finished.")
+ else:
+ logging.critical("The output '{0}' is not supported.".
+ format(spec.output["output"]))
+ ret_code = 1
+
+ except (KeyError, ValueError, PresentationError) as err:
+ logging.info("Finished with an error.")
+ logging.critical(str(err))
ret_code = 1
-
- # except (KeyError, ValueError, PresentationError) as err:
- # logging.info("Finished with an error.")
- # logging.critical(str(err))
- # ret_code = 1
- # except Exception as err:
- # logging.info("Finished with an unexpected error.")
- # logging.critical(str(err))
- # ret_code = 1
- # finally:
- # if spec is not None and not spec.is_debug:
- # clean_environment(spec.environment)
- # return ret_code
+ except Exception as err:
+ logging.info("Finished with an unexpected error.")
+ logging.critical(str(err))
+ ret_code = 1
+ finally:
+ if spec is not None and not spec.is_debug:
+ clean_environment(spec.environment)
+ return ret_code
if __name__ == '__main__':
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 64336b2dde..baff96a3ff 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -81,6 +81,7 @@
# List the directories which are deleted while cleaning the environment.
# All directories MUST be defined in "paths" section.
#- "DIR[BUILD,HTML]"
+ - "DIR[WORKING,DATA]"
build-dirs:
# List the directories where the results (build) is stored.