From 63dc9696dfb0627a6cce80cfd68db78c0af6db7e Mon Sep 17 00:00:00 2001 From: debugtalk Date: Tue, 24 May 2022 22:26:11 +0800 Subject: [PATCH] update docs --- docs/cmd/hrp.md | 3 ++- docs/cmd/hrp_boom.md | 2 +- docs/cmd/hrp_convert.md | 2 +- docs/cmd/hrp_har2case.md | 2 +- docs/cmd/hrp_pytest.md | 2 +- docs/cmd/hrp_run.md | 2 +- docs/cmd/hrp_startproject.md | 2 +- docs/cmd/hrp_wiki.md | 19 +++++++++++++++++++ examples/demo-with-go-plugin/proj.json | 2 +- examples/demo-with-py-plugin/proj.json | 2 +- examples/demo-without-plugin/proj.json | 2 +- hrp/runner.go | 6 +++++- 12 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 docs/cmd/hrp_wiki.md diff --git a/docs/cmd/hrp.md b/docs/cmd/hrp.md index 097cf3fb..f758fe81 100644 --- a/docs/cmd/hrp.md +++ b/docs/cmd/hrp.md @@ -35,5 +35,6 @@ Copyright 2017 debugtalk * [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 wiki](hrp_wiki.md) - visit https://httprunner.com -###### Auto generated by spf13/cobra on 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_boom.md b/docs/cmd/hrp_boom.md index 7277436c..56ed75da 100644 --- a/docs/cmd/hrp_boom.md +++ b/docs/cmd/hrp_boom.md @@ -42,4 +42,4 @@ hrp boom [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_convert.md b/docs/cmd/hrp_convert.md index 3b55f035..bc83ba0f 100644 --- a/docs/cmd/hrp_convert.md +++ b/docs/cmd/hrp_convert.md @@ -18,4 +18,4 @@ hrp convert $path... [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_har2case.md b/docs/cmd/hrp_har2case.md index 41e46787..141aa7ee 100644 --- a/docs/cmd/hrp_har2case.md +++ b/docs/cmd/hrp_har2case.md @@ -24,4 +24,4 @@ hrp har2case $har_path... [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_pytest.md b/docs/cmd/hrp_pytest.md index 0bdbab3c..45f6210c 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 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_run.md b/docs/cmd/hrp_run.md index 8a1fc59b..727aed2d 100644 --- a/docs/cmd/hrp_run.md +++ b/docs/cmd/hrp_run.md @@ -35,4 +35,4 @@ hrp run $path... [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_startproject.md b/docs/cmd/hrp_startproject.md index b669b71d..c1749e1f 100644 --- a/docs/cmd/hrp_startproject.md +++ b/docs/cmd/hrp_startproject.md @@ -20,4 +20,4 @@ hrp startproject $project_name [flags] * [hrp](hrp.md) - Next-Generation API Testing Solution. -###### Auto generated by spf13/cobra on 20-May-2022 +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/docs/cmd/hrp_wiki.md b/docs/cmd/hrp_wiki.md new file mode 100644 index 00000000..9b09a01d --- /dev/null +++ b/docs/cmd/hrp_wiki.md @@ -0,0 +1,19 @@ +## hrp wiki + +visit https://httprunner.com + +``` +hrp wiki [flags] +``` + +### Options + +``` + -h, --help help for wiki +``` + +### SEE ALSO + +* [hrp](hrp.md) - Next-Generation API Testing Solution. + +###### Auto generated by spf13/cobra on 24-May-2022 diff --git a/examples/demo-with-go-plugin/proj.json b/examples/demo-with-go-plugin/proj.json index 3abb9f72..cd7a16d6 100644 --- a/examples/demo-with-go-plugin/proj.json +++ b/examples/demo-with-go-plugin/proj.json @@ -1,6 +1,6 @@ { "project_name": "demo-with-go-plugin", "project_path": "/Users/debugtalk/MyProjects/HttpRunner-dev/httprunner/examples/demo-with-go-plugin", - "create_time": "2022-05-24T22:21:23.330967+08:00", + "create_time": "2022-05-24T22:23:19.739989+08:00", "hrp_version": "v4.1.0-beta" } \ No newline at end of file diff --git a/examples/demo-with-py-plugin/proj.json b/examples/demo-with-py-plugin/proj.json index 131f18a1..486a386c 100644 --- a/examples/demo-with-py-plugin/proj.json +++ b/examples/demo-with-py-plugin/proj.json @@ -1,6 +1,6 @@ { "project_name": "demo-with-py-plugin", "project_path": "/Users/debugtalk/MyProjects/HttpRunner-dev/httprunner/examples/demo-with-py-plugin", - "create_time": "2022-05-24T22:21:30.722372+08:00", + "create_time": "2022-05-24T22:23:27.199105+08:00", "hrp_version": "v4.1.0-beta" } \ No newline at end of file diff --git a/examples/demo-without-plugin/proj.json b/examples/demo-without-plugin/proj.json index c6b74b20..247a3762 100644 --- a/examples/demo-without-plugin/proj.json +++ b/examples/demo-without-plugin/proj.json @@ -1,6 +1,6 @@ { "project_name": "demo-without-plugin", "project_path": "/Users/debugtalk/MyProjects/HttpRunner-dev/httprunner/examples/demo-without-plugin", - "create_time": "2022-05-24T22:21:31.676833+08:00", + "create_time": "2022-05-24T22:23:27.955511+08:00", "hrp_version": "v4.1.0-beta" } \ No newline at end of file diff --git a/hrp/runner.go b/hrp/runner.go index b824d855..97aa1a45 100644 --- a/hrp/runner.go +++ b/hrp/runner.go @@ -289,7 +289,11 @@ func (r *testCaseRunner) parseConfig() error { // merge config environment variables with base_url // priority: env base_url > base_url - r.parsedConfig.Env = cfg.Env + if cfg.Env != nil { + r.parsedConfig.Env = cfg.Env + } else { + r.parsedConfig.Env = make(map[string]string) + } if value, ok := r.parsedConfig.Env["base_url"]; !ok || value == "" { r.parsedConfig.Env["base_url"] = r.parsedConfig.BaseURL }