diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 5de875a4..be363c69 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,11 @@ # Release History +## 2.5.2 (2020-01-02) + +**Fixed** + +- fix #826: Windows does not support file name include ":" + ## 2.5.1 (2020-01-02) **Fixed** diff --git a/httprunner/__init__.py b/httprunner/__init__.py index b11684b6..86fe1344 100644 --- a/httprunner/__init__.py +++ b/httprunner/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.5.1" +__version__ = "2.5.2" __description__ = "One-stop solution for HTTP(S) testing." __all__ = ["__version__", "__description__"] diff --git a/httprunner/report/html/gen_report.py b/httprunner/report/html/gen_report.py index 303abd63..af7814c6 100644 --- a/httprunner/report/html/gen_report.py +++ b/httprunner/report/html/gen_report.py @@ -42,7 +42,8 @@ def gen_html_report(summary, report_template=None, report_dir=None, report_file= report_file_name = os.path.basename(report_file) else: report_dir = report_dir or os.path.join(os.getcwd(), "reports") - report_file_name = "{}.html".format(utc_time_iso_8601_str) + # fix #826: Windows does not support file name include ":" + report_file_name = "{}.html".format(utc_time_iso_8601_str.replace(":", "").replace("-", "")) if not os.path.isdir(report_dir): os.makedirs(report_dir) diff --git a/httprunner/report/report.py b/httprunner/report/report.py new file mode 100644 index 00000000..29824cc2 --- /dev/null +++ b/httprunner/report/report.py @@ -0,0 +1,51 @@ +import json +import platform +import time +import uuid + +import requests + +from httprunner import __version__ + + +def prepare_event_kwargs(event_name, params): + """ prepare report event kwargs""" + + kwargs = { + "headers": { + 'content-type': 'application/json' + }, + "json": { + "user": { + "user_unique_id": str(uuid.getnode()) + }, + "header": { + "app_id": 173519, + "os_name": platform.system(), + "os_version": platform.release(), + "app_version": __version__ # HttpRunner version + }, + "events": [ + { + "event": event_name, + "params": json.dumps(params), + "time": int(time.time()) + } + ], + "verbose": 1 + } + } + return kwargs + + +def report_event(event_name, success=True): + params = { + "success": 1 if success else 0 + } + kwargs = prepare_event_kwargs(event_name, params) + resp = requests.post("http://mcs.snssdk.com/v1/json", **kwargs) + print("resp---", resp.json()) + + +if __name__ == '__main__': + report_event("loader") diff --git a/pyproject.toml b/pyproject.toml index 8a3e70a2..39fec7ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "httprunner" -version = "2.5.1" +version = "2.5.2" description = "One-stop solution for HTTP(S) testing." license = "Apache-2.0" readme = "README.md"