From aa65962ffe4140e05d581633571f861af6da5671 Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Wed, 31 May 2023 20:24:00 +0800 Subject: [PATCH] bump version --- docs/CHANGELOG.md | 5 +++-- docs/cmd/hrp.md | 6 ++---- docs/cmd/hrp_boom.md | 3 +-- docs/cmd/hrp_build.md | 2 +- docs/cmd/hrp_convert.md | 17 +++++++++------- docs/cmd/hrp_dns.md | 2 +- docs/cmd/hrp_ping.md | 2 +- docs/cmd/hrp_pytest.md | 2 +- docs/cmd/hrp_run.md | 20 +++++++++---------- docs/cmd/hrp_startproject.md | 2 +- docs/cmd/hrp_wiki.md | 2 +- examples/demo-empty-project/proj.json | 4 ++-- examples/demo-with-go-plugin/proj.json | 4 ++-- examples/demo-with-py-plugin/proj.json | 4 ++-- examples/demo-without-plugin/proj.json | 4 ++-- .../templates/plugin/.debugtalk_gen.py | 2 +- .../templates/plugin/debugtalk_gen.go | 2 +- hrp/internal/version/VERSION | 2 +- hrp/runner.go | 2 +- 19 files changed, 44 insertions(+), 43 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index df8823ae..d240eac2 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -8,10 +8,11 @@ - feat: cache screenshot ocr texts - feat: set testcase and request timeout in seconds - feat: catch interrupt signal -- feat: add new exit code MobileUILaunchAppError/InterruptError/TimeoutError/MobileUIPopupError +- feat: add new exit code MobileUILaunchAppError/InterruptError/TimeoutError/MobileUIActivityNotMatchError/MobileUIPopupError - feat: find text with regex - feat: add UI ocr tags to summary -- refactor: simplify OCR APIs +- feat: check android device offline when running shell failed +- refactor: replace OCR APIs with image APIs - refactor: FindText(s) returns OCRText(s) - refactor: merge ActionOption with DataOption - change: exit with AndroidShellExecError code for adb shell failure diff --git a/docs/cmd/hrp.md b/docs/cmd/hrp.md index e60bfc4c..157e6a35 100644 --- a/docs/cmd/hrp.md +++ b/docs/cmd/hrp.md @@ -31,14 +31,12 @@ Copyright 2017 debugtalk * [hrp boom](hrp_boom.md) - run load test with boomer * [hrp build](hrp_build.md) - build plugin for testing -* [hrp convert](hrp_convert.md) - convert to JSON/YAML/gotest/pytest testcases -* [hrp curl](hrp_curl.md) - run integrated curl command +* [hrp convert](hrp_convert.md) - convert multiple source format to HttpRunner JSON/YAML/gotest/pytest cases * [hrp dns](hrp_dns.md) - DNS resolution for different source and record types * [hrp ping](hrp_ping.md) - run integrated ping command * [hrp pytest](hrp_pytest.md) - run API test with pytest * [hrp run](hrp_run.md) - run API test with go engine * [hrp startproject](hrp_startproject.md) - create a scaffold project -* [hrp traceroute](hrp_traceroute.md) - run integrated traceroute command * [hrp wiki](hrp_wiki.md) - visit https://httprunner.com -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_boom.md b/docs/cmd/hrp_boom.md index c5c92782..997687e1 100644 --- a/docs/cmd/hrp_boom.md +++ b/docs/cmd/hrp_boom.md @@ -53,6 +53,5 @@ hrp boom [flags] ### SEE ALSO * [hrp](hrp.md) - Next-Generation API Testing Solution. -* [hrp boom curl](hrp_boom_curl.md) - run load test with curl command -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_build.md b/docs/cmd/hrp_build.md index 69f024ff..baaf0dc0 100644 --- a/docs/cmd/hrp_build.md +++ b/docs/cmd/hrp_build.md @@ -28,4 +28,4 @@ hrp build $path ... [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_convert.md b/docs/cmd/hrp_convert.md index 5f47069a..879dc938 100644 --- a/docs/cmd/hrp_convert.md +++ b/docs/cmd/hrp_convert.md @@ -1,6 +1,6 @@ ## hrp convert -convert to JSON/YAML/gotest/pytest testcases +convert multiple source format to HttpRunner JSON/YAML/gotest/pytest cases ``` hrp convert $path... [flags] @@ -9,18 +9,21 @@ hrp convert $path... [flags] ### Options ``` + --from-curl load from curl format + --from-har load from HAR format + --from-json load from json case format (default true) + --from-postman load from postman format + --from-yaml load from yaml case format -h, --help help for convert - -d, --output-dir string specify output directory, default to the same dir with har file + -d, --output-dir string specify output directory -p, --profile string specify profile path to override headers and cookies - --to-gotest convert to gotest scripts (TODO) - --to-json convert to JSON scripts (default) + --to-json convert to JSON case scripts (default true) --to-pytest convert to pytest scripts - --to-yaml convert to YAML scripts + --to-yaml convert to YAML case scripts ``` ### SEE ALSO * [hrp](hrp.md) - Next-Generation API Testing Solution. -* [hrp convert curl](hrp_convert_curl.md) - convert curl command to httprunner testcase -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_dns.md b/docs/cmd/hrp_dns.md index d2aaef60..353c3fda 100644 --- a/docs/cmd/hrp_dns.md +++ b/docs/cmd/hrp_dns.md @@ -26,4 +26,4 @@ hrp dns $url [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_ping.md b/docs/cmd/hrp_ping.md index 0475d93b..6ef40122 100644 --- a/docs/cmd/hrp_ping.md +++ b/docs/cmd/hrp_ping.md @@ -20,4 +20,4 @@ hrp ping $url [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_pytest.md b/docs/cmd/hrp_pytest.md index 3512a8ea..9dddefc7 100644 --- a/docs/cmd/hrp_pytest.md +++ b/docs/cmd/hrp_pytest.md @@ -16,4 +16,4 @@ hrp pytest $path ... [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_run.md b/docs/cmd/hrp_run.md index a0f70751..a80639f3 100644 --- a/docs/cmd/hrp_run.md +++ b/docs/cmd/hrp_run.md @@ -21,19 +21,19 @@ hrp run $path... [flags] ### Options ``` - -c, --continue-on-failure continue running next step when failure occurs - -g, --gen-html-report generate html report - -h, --help help for run - --http-stat turn on HTTP latency stat (DNSLookup, TCP Connection, etc.) - --log-plugin turn on plugin logging - --log-requests-off turn off request & response details logging - -p, --proxy-url string set proxy url - -s, --save-tests save tests summary + --case-timeout float32 set testcase timeout (seconds) (default 3600) + -c, --continue-on-failure continue running next step when failure occurs + -g, --gen-html-report generate html report + -h, --help help for run + --http-stat turn on HTTP latency stat (DNSLookup, TCP Connection, etc.) + --log-plugin turn on plugin logging + --log-requests-off turn off request & response details logging + -p, --proxy-url string set proxy url + -s, --save-tests save tests summary ``` ### SEE ALSO * [hrp](hrp.md) - Next-Generation API Testing Solution. -* [hrp run curl](hrp_run_curl.md) - run API test with curl command -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_startproject.md b/docs/cmd/hrp_startproject.md index 888c7457..56d1562a 100644 --- a/docs/cmd/hrp_startproject.md +++ b/docs/cmd/hrp_startproject.md @@ -21,4 +21,4 @@ hrp startproject $project_name [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/docs/cmd/hrp_wiki.md b/docs/cmd/hrp_wiki.md index 97986ea5..32fcc471 100644 --- a/docs/cmd/hrp_wiki.md +++ b/docs/cmd/hrp_wiki.md @@ -16,4 +16,4 @@ hrp wiki [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 21-Oct-2022 +###### Auto generated by spf13/cobra on 31-May-2023 diff --git a/examples/demo-empty-project/proj.json b/examples/demo-empty-project/proj.json index edf45464..dd7a3b46 100644 --- a/examples/demo-empty-project/proj.json +++ b/examples/demo-empty-project/proj.json @@ -1,5 +1,5 @@ { "project_name": "demo-empty-project", - "create_time": "2022-10-21T21:54:56.252853+08:00", - "hrp_version": "v4.3.0" + "create_time": "2023-05-31T20:46:10.736189+08:00", + "hrp_version": "v4.3.4" } diff --git a/examples/demo-with-go-plugin/proj.json b/examples/demo-with-go-plugin/proj.json index 867531eb..8f68209a 100644 --- a/examples/demo-with-go-plugin/proj.json +++ b/examples/demo-with-go-plugin/proj.json @@ -1,5 +1,5 @@ { "project_name": "demo-with-go-plugin", - "create_time": "2022-10-21T21:52:38.979867+08:00", - "hrp_version": "v4.3.0" + "create_time": "2023-05-31T20:44:56.120736+08:00", + "hrp_version": "v4.3.4" } diff --git a/examples/demo-with-py-plugin/proj.json b/examples/demo-with-py-plugin/proj.json index c0aeb776..c90653d1 100644 --- a/examples/demo-with-py-plugin/proj.json +++ b/examples/demo-with-py-plugin/proj.json @@ -1,5 +1,5 @@ { "project_name": "demo-with-py-plugin", - "create_time": "2022-10-21T21:52:39.555851+08:00", - "hrp_version": "v4.3.0" + "create_time": "2023-05-31T20:45:00.44921+08:00", + "hrp_version": "v4.3.4" } diff --git a/examples/demo-without-plugin/proj.json b/examples/demo-without-plugin/proj.json index 593129a3..d7797860 100644 --- a/examples/demo-without-plugin/proj.json +++ b/examples/demo-without-plugin/proj.json @@ -1,5 +1,5 @@ { "project_name": "demo-without-plugin", - "create_time": "2022-10-21T21:54:56.136458+08:00", - "hrp_version": "v4.3.0" + "create_time": "2023-05-31T20:46:10.621009+08:00", + "hrp_version": "v4.3.4" } diff --git a/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py b/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py index d5c51015..75cdd6ed 100644 --- a/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py +++ b/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py @@ -1,4 +1,4 @@ -# NOTE: Generated By hrp v4.3.0, DO NOT EDIT! +# NOTE: Generated By hrp v4.3.4, DO NOT EDIT! import sys import os diff --git a/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go b/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go index ca8bcde3..cec9b779 100644 --- a/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go +++ b/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go @@ -1,4 +1,4 @@ -// NOTE: Generated By hrp v4.3.4-beta-202305032303, DO NOT EDIT! +// NOTE: Generated By hrp v4.3.4, DO NOT EDIT! package main import ( diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index cce148ba..bd4c8f53 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.3.4-beta-202305311805 \ No newline at end of file +v4.3.4 \ No newline at end of file diff --git a/hrp/runner.go b/hrp/runner.go index 818d695c..b30ca69e 100644 --- a/hrp/runner.go +++ b/hrp/runner.go @@ -452,7 +452,7 @@ func (r *CaseRunner) parseConfig() error { } client, err := device.NewDriver(nil) if err != nil { - return errors.Wrap(err, "init Android UIAutomator client failed") + return errors.Wrap(err, "init Android client failed") } r.hrpRunner.uiClients[device.SerialNumber] = client }