GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix' into modular

Browse Source
This commit is contained in:
debugtalk
2018-08-03 23:58:45 +08:00
parent fd8c1682e4 a650c964ec
commit 1ae7040627
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
httprunner/__about__.py
View File

@@ -1,7 +1,7 @@
__title__ = 'HttpRunner'
__description__ = 'One-stop solution for HTTP(S) testing.'
__url__ = 'https://github.com/HttpRunner/HttpRunner'
__version__ = '1.5.8'
__version__ = '1.5.9'
__author__ = 'debugtalk'
__author_email__ = 'mail@debugtalk.com'
__license__ = 'MIT'

8
httprunner/report.py
View File

@@ -120,9 +120,7 @@ def stringify_data(meta_data, request_or_response):
}
"""
headers = meta_data[request_or_response]["headers"]
request_or_response_dict = meta_data[request_or_response]
response_content_type = meta_data["response"]["content_type"]
for key, value in request_or_response_dict.items():
@@ -135,11 +133,11 @@ def stringify_data(meta_data, request_or_response):
if not encoding or encoding == "None":
encoding = "utf-8"
if request_or_response == "response" and key == "content" and "image" in response_content_type:
if request_or_response == "response" and key == "content" \
and "image" in meta_data["response"]["content_type"]:
# display image
meta_data["response"]["content_type"] = "image"
value = "data:{};base64,{}".format(
response_content_type,
meta_data["response"]["content_type"],
b64encode(value).decode(encoding)
)
else:

8
httprunner/templates/report_template.html
View File

@@ -272,20 +272,20 @@
<div style="overflow: auto">
<table>
{% for key, value in record.meta_data.response.items() %}
{% if key in ["content", "json", "elapsed_ms", "response_time_ms", "content_size", "content_type"] %}
{% if key in ["text", "json", "elapsed_ms", "response_time_ms", "content_size", "content_type"] %}
{% continue %}
{% endif %}
<tr>
<th>{{key}}</th>
<td>
{% if key == "headers" %}
{% for header_key, header_value in record.meta_data.request.headers.items() %}
{% for header_key, header_value in record.meta_data.response.headers.items() %}
<div>
<strong>{{ header_key }}</strong>: {{ header_value }}
</div>
{% endfor %}
{% elif key == "text" %}
{% if value == "image" %}
{% elif key == "content" %}
{% if "image" in record.meta_data.response.content_type %}
<img src="{{ record.meta_data.response.content }}" />
{% else %}
<pre>{{ record.meta_data.response.text | e }}</pre>

2
tests/test_response.py
View File

@@ -135,7 +135,7 @@ class TestResponse(ApiServerUnittest):
]
extract_binds_dict = resp_obj.extract_response(extract_binds_list)
self.assertGreater(extract_binds_dict["resp_elapsed_microseconds"], 1000)
self.assertEqual(extract_binds_dict["resp_elapsed_seconds"], 0)
self.assertLess(extract_binds_dict["resp_elapsed_seconds"], 3)
self.assertEqual(extract_binds_dict["resp_elapsed_days"], 0)
self.assertGreater(extract_binds_dict["resp_elapsed_total_seconds"], 0)