diff --git a/README.en.md b/README.en.md index 5ea40915..7a6a14ab 100644 --- a/README.en.md +++ b/README.en.md @@ -88,17 +88,20 @@ Usage: Available Commands: boom run load test with boomer + build build plugin for testing completion generate the autocompletion script for the specified shell - har2case convert HAR to json/yaml testcase files + convert convert to JSON/YAML/gotest/pytest testcases help Help about any command pytest run API test with pytest run run API test with go engine startproject create a scaffold project + wiki visit https://httprunner.com Flags: -h, --help help for hrp --log-json set log to json format -l, --log-level string set log level (default "INFO") + --venv string specify python3 venv path -v, --version version for hrp Use "hrp [command] --help" for more information about a command. @@ -107,7 +110,6 @@ Use "hrp [command] --help" for more information about a command. ## User Cases - diff --git a/README.md b/README.md index 45cae2dd..4debd21a 100644 --- a/README.md +++ b/README.md @@ -81,17 +81,20 @@ Usage: Available Commands: boom run load test with boomer + build build plugin for testing completion generate the autocompletion script for the specified shell - har2case convert HAR to json/yaml testcase files + convert convert to JSON/YAML/gotest/pytest testcases help Help about any command pytest run API test with pytest run run API test with go engine startproject create a scaffold project + wiki visit https://httprunner.com Flags: -h, --help help for hrp --log-json set log to json format -l, --log-level string set log level (default "INFO") + --venv string specify python3 venv path -v, --version version for hrp Use "hrp [command] --help" for more information about a command. @@ -100,7 +103,6 @@ Use "hrp [command] --help" for more information about a command. ## 用户案例 - diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f918cbcc..5b1128b6 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,19 +1,18 @@ # Release History -## v4.2.0 (2022-07-22) +## v4.2.0 (2022-07-26) **go version** -- feat: support multi-machine collaborative distributed load testing -- feat: support indicating type and filename when uploading file -- feat: support to infer MIME type of the file automatically -- feat: support omitting websocket url if not necessary -- feat: support multiple websocket connections each session -- feat: support convert curl command(s) to testcase(s) -- feat: support run curl as subcommand of run/boom/convert +- feat: support distributed load testing on multi-machines +- feat: support run/boom/convert curl command(s) +- feat: support uploading file with indicated type and filename +- feat: support to infer MIME type of the uploaded file automatically +- feat: using `@FILEPATH` to indicate the path of the file +- change: support omitting websocket url if not necessary +- change: support multiple websocket connections for each session - fix: optimize websocket step initialization -- fix: using `@FILEPATH` to indicate the path of the file -- fix: reuse plugin instance if it already initialized +- fix: reuse plugin instance if already initialized - fix: deep copy api step to avoid data racing ## v4.1.6 (2022-07-04) diff --git a/docs/cmd/hrp.md b/docs/cmd/hrp.md index b7aab39f..445e658b 100644 --- a/docs/cmd/hrp.md +++ b/docs/cmd/hrp.md @@ -37,4 +37,4 @@ Copyright 2017 debugtalk * [hrp startproject](hrp_startproject.md) - create a scaffold project * [hrp wiki](hrp_wiki.md) - visit https://httprunner.com -###### Auto generated by spf13/cobra on 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_boom.md b/docs/cmd/hrp_boom.md index f61722a1..b8d10d41 100644 --- a/docs/cmd/hrp_boom.md +++ b/docs/cmd/hrp_boom.md @@ -21,14 +21,14 @@ hrp boom [flags] ### Options ``` - --autostart Starts the test immediately (without disabling the web UI). Use --spawn-count and --spawn-rate to control user count and increase rate + --auto-start Starts the test immediately. Use --spawn-count and --spawn-rate to control user count and increase rate --cpu-profile string Enable CPU profiling. --cpu-profile-duration duration CPU profile duration. (default 30s) --disable-compression Disable compression --disable-console-output Disable console output. --disable-keepalive Disable keepalive --expect-workers int How many workers master should expect to connect before starting the test (only when --autostart is used) (default 1) - --expect-workers-max-wait int How many workers master should expect to connect before starting the test (only when --autostart is used + --expect-workers-max-wait int How many workers master should expect to connect before starting the test (only when --autostart is used (default 120) -h, --help help for boom --ignore-quit ignores quit from master (only when --worker is used) --loop-count int The specify running cycles for load testing (default -1) @@ -52,6 +52,6 @@ hrp boom [flags] ### SEE ALSO * [hrp](hrp.md) - Next-Generation API Testing Solution. -* [hrp boom curl](hrp_boom_curl.md) - run load test with boomer by curl command +* [hrp boom curl](hrp_boom_curl.md) - run load test with curl command -###### Auto generated by spf13/cobra on 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_boom_curl.md b/docs/cmd/hrp_boom_curl.md index 23b442aa..587ecb9a 100644 --- a/docs/cmd/hrp_boom_curl.md +++ b/docs/cmd/hrp_boom_curl.md @@ -1,6 +1,6 @@ ## hrp boom curl -run load test with boomer by curl command +run load test with curl command ``` hrp boom curl URLs [flags] @@ -16,4 +16,4 @@ hrp boom curl URLs [flags] * [hrp boom](hrp_boom.md) - run load test with boomer -###### Auto generated by spf13/cobra on 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_build.md b/docs/cmd/hrp_build.md index 9e861f9b..30e93c8b 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 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_convert.md b/docs/cmd/hrp_convert.md index 2e6d1f57..93a89cac 100644 --- a/docs/cmd/hrp_convert.md +++ b/docs/cmd/hrp_convert.md @@ -23,4 +23,4 @@ hrp convert $path... [flags] * [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 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_convert_curl.md b/docs/cmd/hrp_convert_curl.md index 87b089bf..23d89f48 100644 --- a/docs/cmd/hrp_convert_curl.md +++ b/docs/cmd/hrp_convert_curl.md @@ -16,4 +16,4 @@ hrp convert curl URLs [flags] * [hrp convert](hrp_convert.md) - convert to JSON/YAML/gotest/pytest testcases -###### Auto generated by spf13/cobra on 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_pytest.md b/docs/cmd/hrp_pytest.md index c3c9bc27..9f644920 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 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_run.md b/docs/cmd/hrp_run.md index a64b6a76..6983ba63 100644 --- a/docs/cmd/hrp_run.md +++ b/docs/cmd/hrp_run.md @@ -34,6 +34,6 @@ hrp run $path... [flags] ### SEE ALSO * [hrp](hrp.md) - Next-Generation API Testing Solution. -* [hrp run curl](hrp_run_curl.md) - run API test with go engine by curl command +* [hrp run curl](hrp_run_curl.md) - run API test with curl command -###### Auto generated by spf13/cobra on 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_run_curl.md b/docs/cmd/hrp_run_curl.md index 78df21be..c7c98150 100644 --- a/docs/cmd/hrp_run_curl.md +++ b/docs/cmd/hrp_run_curl.md @@ -1,6 +1,6 @@ ## hrp run curl -run API test with go engine by curl command +run API test with curl command ``` hrp run curl URLs [flags] @@ -16,4 +16,4 @@ hrp run curl URLs [flags] * [hrp run](hrp_run.md) - run API test with go engine -###### Auto generated by spf13/cobra on 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_startproject.md b/docs/cmd/hrp_startproject.md index e5877aab..45a81b7b 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 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/docs/cmd/hrp_wiki.md b/docs/cmd/hrp_wiki.md index 41754c3b..b18979f2 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 22-Jul-2022 +###### Auto generated by spf13/cobra on 26-Jul-2022 diff --git a/examples/demo-with-go-plugin/proj.json b/examples/demo-with-go-plugin/proj.json index 1899c546..ecc3509d 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-07-11T11:44:36.214909+08:00", - "hrp_version": "v4.1.6" + "create_time": "2022-07-26T10:30:29.31361+08:00", + "hrp_version": "v4.2.0" } diff --git a/examples/demo-with-py-plugin/proj.json b/examples/demo-with-py-plugin/proj.json index f2336020..8140ae8b 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-07-11T11:44:37.021634+08:00", - "hrp_version": "v4.1.6" + "create_time": "2022-07-26T10:30:30.601095+08:00", + "hrp_version": "v4.2.0" } diff --git a/hrp/README.md b/hrp/README.md index 31878c5f..38a41391 100644 --- a/hrp/README.md +++ b/hrp/README.md @@ -81,15 +81,15 @@ type SessionRunner struct { ```go func (r *SessionRunner) Start() error { - ... - // run step in sequential order + ... + // run step in sequential order for _, step := range r.testCase.TestSteps { _, err := step.Run(r) if err != nil && r.hrpRunner.failfast { return errors.Wrap(err, "abort running due to failfast setting") } } - ... + ... } ``` diff --git a/hrp/cmd/curl.go b/hrp/cmd/curl.go index 8f5970a9..214c880d 100644 --- a/hrp/cmd/curl.go +++ b/hrp/cmd/curl.go @@ -15,7 +15,7 @@ import ( var runCurlCmd = &cobra.Command{ Use: "curl URLs", - Short: "run API test with go engine by curl command", + Short: "run API test with curl command", Args: cobra.MinimumNArgs(1), DisableFlagParsing: true, PreRun: func(cmd *cobra.Command, args []string) { @@ -31,7 +31,7 @@ var runCurlCmd = &cobra.Command{ var boomCurlCmd = &cobra.Command{ Use: "curl URLs", - Short: "run load test with boomer by curl command", + Short: "run load test with curl command", Args: cobra.MinimumNArgs(1), DisableFlagParsing: true, PreRun: func(cmd *cobra.Command, args []string) { diff --git a/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py b/hrp/internal/scaffold/templates/plugin/.debugtalk_gen.py index a10c688d..708b20f9 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.1.6, DO NOT EDIT! +# NOTE: Generated By hrp v4.2.0, DO NOT EDIT! import sys import os @@ -10,7 +10,6 @@ from debugtalk import * if __name__ == "__main__": import funppy - funppy.register("get_user_agent", get_user_agent) funppy.register("sleep", sleep) funppy.register("sum", sum) diff --git a/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go b/hrp/internal/scaffold/templates/plugin/debugtalk_gen.go index 73fe8e9d..fd479e84 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.1.6, DO NOT EDIT! +// NOTE: Generated By hrp v4.2.0, DO NOT EDIT! package main import ( diff --git a/hrp/internal/version/VERSION b/hrp/internal/version/VERSION index b91a7785..15a2b33b 100644 --- a/hrp/internal/version/VERSION +++ b/hrp/internal/version/VERSION @@ -1 +1 @@ -v4.1.6 \ No newline at end of file +v4.2.0 \ No newline at end of file diff --git a/httprunner/__init__.py b/httprunner/__init__.py index 806fbae9..fe4e9b1c 100644 --- a/httprunner/__init__.py +++ b/httprunner/__init__.py @@ -1,4 +1,4 @@ -__version__ = "v4.1.6" +__version__ = "v4.2.0" __description__ = "One-stop solution for HTTP(S) testing." diff --git a/pyproject.toml b/pyproject.toml index bcfa92ba..18786b00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "httprunner" -version = "v4.1.6" +version = "v4.2.0" description = "One-stop solution for HTTP(S) testing." license = "Apache-2.0" readme = "README.md"