Merge pull request #42 from tsbxmw/dev-2.1.0

bug fix 2.1.0: add end_time
hautof · Dec 13, 2018 · 9c70ce8 · 9c70ce8
2 parents 28c4abf + 7ad6efe
commit 9c70ce8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/haf/recorder.py b/haf/recorder.py
@@ -120,16 +120,15 @@ def add_result_to_suite(self, result:HttpApiResult):
             case = result.case
             suite = Detail(case.bench_name)
             suite.begin_time = result.begin_time
-            suite.end_time = result.end_time
-            suite.cases.append(result)
         else:
+            # find suite here
             for suite in self.results.details.values():
                 if suite.suite_name == result.case.bench_name:
                     suite = suite
                     break
-            suite.end_time = result.end_time
-            suite.duration = Utils.get_date_result(suite.begin_time, suite.end_time)
-            suite.cases.append(result)
+        suite.end_time = result.end_time
+        suite.duration = Utils.get_date_result(suite.begin_time, suite.end_time)
+        suite.cases.append(result)
         self.results.details[result.case.bench_name] = suite
 
     def result_handler(self, result:HttpApiResult):

diff --git a/haf/utils.py b/haf/utils.py
@@ -336,7 +336,11 @@ def get_date_result(begin, end):
             s1 = float(s1)
             d2 = datetime.strptime(d2, "%Y-%m-%d %H:%M:%S")
             s2 = float(s2)
-            return (d2-d1).seconds + (s2-s1)/1000
+            sec = (d2-d1).seconds
+            if sec == 0:
+                return (s2-s1)/1000
+            else:
+                return float(sec) + (s2-s1)/1000
         except Exception as e:
             return 0