From 1e6ed4a630296305042938975a5680db13980165 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Wed, 13 Mar 2019 19:26:00 -0400 Subject: [PATCH] Fix test Python 3 integer divide difference. Use float for both Python 2 & 3 like the rest of the metrics. refs #14393 Arvados-DCO-1.1-Signed-off-by: Tom Morris --- tools/crunchstat-summary/crunchstat_summary/summarizer.py | 4 ++-- ...tainer_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py index 543011ea2c..bcdc871a45 100644 --- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py +++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py @@ -290,7 +290,7 @@ class Summarizer(object): self.stats_max['cpu']['user+sys__rate'], lambda x: x * 100), ('Overall CPU usage: {}%', - self.job_tot['cpu']['user+sys'] / + float(self.job_tot['cpu']['user+sys']) / self.job_tot['time']['elapsed'] if self.job_tot['time']['elapsed'] > 0 else 0, lambda x: x * 100), @@ -344,7 +344,7 @@ class Summarizer(object): 'try runtime_constraints "{}":{}' ).format( self.label, - int(math.ceil(cpu_max_rate*100)), + math.ceil(cpu_max_rate*100), constraint_key, int(used_cores)) diff --git a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report index 9819461949..5148a4523a 100644 --- a/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report +++ b/tools/crunchstat-summary/tests/container_9tee4-dz642-lymtndkpy39eibk-arv-mount.txt.gz.report @@ -14,7 +14,7 @@ time elapsed 10 - 10 # Number of tasks: 1 # Max CPU time spent by a single task: 0s # Max CPU usage in a single interval: 0% -# Overall CPU usage: 0% +# Overall CPU usage: 0.00% # Max memory used by a single task: 0.00GB # Max network traffic in a single task: 0.00GB # Max network speed in a single interval: 0.00MB/s -- 2.30.2