From 8e07c5357d084028d47ff5a0f69a5b6a82abf090 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 22 May 2018 21:41:28 +0800
Subject: [PATCH 1/4] add TODO for comparator uniform

---
 httprunner/context.py | 1 +
 httprunner/task.py    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/httprunner/context.py b/httprunner/context.py
index 8b260a3a..a1c1bfa6 100644
--- a/httprunner/context.py
+++ b/httprunner/context.py
@@ -217,6 +217,7 @@ class Context(object):
     def do_validation(self, validator_dict):
         """ validate with functions
         """
+        # TODO: move comparator uniform to init_task_suite
         comparator = utils.get_uniform_comparator(validator_dict["comparator"])
         validate_func = self.testcase_parser.get_bind_function(comparator)
 
diff --git a/httprunner/task.py b/httprunner/task.py
index 1757c315..fe9127f4 100644
--- a/httprunner/task.py
+++ b/httprunner/task.py
@@ -202,6 +202,7 @@ def init_task_suite(path_or_testsets, mapping=None, http_client_session=None):
     else:
         testsets = path_or_testsets
 
+    # TODO: move comparator uniform here
     mapping = mapping or {}
     return TaskSuite(testsets, mapping, http_client_session)
 

From 1c933078b48b2dc2909f03c85dde00c43962e0e8 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Fri, 25 May 2018 15:18:24 +0800
Subject: [PATCH 2/4] fix typo error

---
 httprunner/runner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httprunner/runner.py b/httprunner/runner.py
index 8160f20b..a7f2a475 100644
--- a/httprunner/runner.py
+++ b/httprunner/runner.py
@@ -210,7 +210,7 @@ class Runner(object):
         for variable in output_variables_list:
             if variable not in variables_mapping:
                 logger.log_warning(
-                    "variable '{}' can not be found in variables mapping, failed to ouput!"\
+                    "variable '{}' can not be found in variables mapping, failed to output!"\
                         .format(variable)
                 )
                 continue

From 87608aa467c0896f451fdb0a4876de8152f043dc Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 29 May 2018 14:25:15 +0800
Subject: [PATCH 3/4] replace (ms) to _ms

---
 httprunner/client.py                              | 6 +++---
 httprunner/templates/default_report_template.html | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/httprunner/client.py b/httprunner/client.py
index 80a1b1fe..f5140afa 100644
--- a/httprunner/client.py
+++ b/httprunner/client.py
@@ -103,8 +103,8 @@ class HttpSession(requests.Session):
         self.meta_data["request_time"] = time.time()
         response = self._send_request_safe_mode(method, url, **kwargs)
         # record the consumed time
-        self.meta_data["response_time(ms)"] = round((time.time() - self.meta_data["request_time"]) * 1000, 2)
-        self.meta_data["elapsed(ms)"] = response.elapsed.microseconds / 1000.0
+        self.meta_data["response_time_ms"] = round((time.time() - self.meta_data["request_time"]) * 1000, 2)
+        self.meta_data["elapsed_ms"] = response.elapsed.microseconds / 1000.0
 
         self.meta_data["url"] = (response.history and response.history[0] or response)\
             .request.url
@@ -140,7 +140,7 @@ class HttpSession(requests.Session):
             logger.log_info(
                 """status_code: {}, response_time(ms): {} ms, response_length: {} bytes""".format(
                     self.meta_data["status_code"],
-                    self.meta_data["response_time(ms)"],
+                    self.meta_data["response_time_ms"],
                     self.meta_data["content_size"]
                 )
             )
diff --git a/httprunner/templates/default_report_template.html b/httprunner/templates/default_report_template.html
index c2c16852..fef8610e 100644
--- a/httprunner/templates/default_report_template.html
+++ b/httprunner/templates/default_report_template.html
@@ -180,7 +180,7 @@
       <tr id="record_{{loop.index}}">
         <th class="{{record.status}}" style="width:5em;">{{record.status}}</td>
         <td>{{record.name}}</td>
-        <td style="text-align:center;width:6em;">{{ record.meta_data["response_time(ms)"] }} ms</td>
+        <td style="text-align:center;width:6em;">{{ record.meta_data["response_time_ms"] }} ms</td>
         <td class="detail">
 
           <a class="button" href="#popup_log_{{loop.index}}">log</a>
@@ -264,11 +264,11 @@
                       </tr>
                     <tr>
                       <th>response_time(ms)</th>
-                      <td>{{ record.meta_data["response_time(ms)"] }}</td>
+                      <td>{{ record.meta_data["response_time_ms"] }}</td>
                     </tr>
                     <tr>
                       <th>elapsed(ms)</th>
-                      <td>{{ record.meta_data["elapsed(ms)"] }}</td>
+                      <td>{{ record.meta_data["elapsed_ms"] }}</td>
                     </tr>
                   </table>
                 </div>

From aaa6aaaa7562e8c227ec74ec3bacc4b98e704956 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Tue, 29 May 2018 15:06:21 +0800
Subject: [PATCH 4/4] fix variable name

---
 httprunner/templates/extent_report_template.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httprunner/templates/extent_report_template.html b/httprunner/templates/extent_report_template.html
index ec0297ef..ecbefa8a 100644
--- a/httprunner/templates/extent_report_template.html
+++ b/httprunner/templates/extent_report_template.html
@@ -165,7 +165,7 @@
                                 test-id='{{ forloop.counter }}'>
                                 <div class='test-heading'>
                                     <span class='test-name'>{{ record.name }}</span>
-                                    <span class='test-time'>{{ record.meta_data.response_time }} ms</span>
+                                    <span class='test-time'>{{ record.meta_data.response_time_ms }} ms</span>
                                     <span class='test-status right pass'>pass</span>
                                 </div>
                                 {% elif record.status == 'error' %}
@@ -173,13 +173,13 @@
                                 test-id='{{ forloop.counter }}'>
                             <div class='test-heading'>
                                 <span class='test-name'>{{ record.name }}</span>
-                                <span class='test-time'>{{ record.meta_data.response_time }} ms</span>
+                                <span class='test-time'>{{ record.meta_data.response_time_ms }} ms</span>
                                 <span class='test-status right fail'>fail</span>
                             </div>
                         {% endif %}
                     <div class='test-content hide'>
                         <div class='test-time-info'>
-                            <span class='label start-time'>{{ record.meta_data.response_time }} ms</span>
+                            <span class='label start-time'>{{ record.meta_data.response_time_ms }} ms</span>
                         </div>
                         <div class='test-steps'>
                             <table class='bordered table-results'>