mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 15:37:35 +08:00
Merge pull request #1409 from bbx-winner/convert-curl
feat: support to run/boom/convert curl case
This commit is contained in:
debugtalk
@@ -10,6 +10,8 @@
|
|||||||
- feat: support omitting websocket url if not necessary
|
- feat: support omitting websocket url if not necessary
|
||||||
- feat: support multiple websocket connections each session
|
- feat: support multiple websocket connections each session
|
||||||
- fix: optimize websocket step initialization
|
- fix: optimize websocket step initialization
|
||||||
|
- feat: support convert curl command(s) to testcase(s)
|
||||||
|
- feat: support run curl as subcommand of run/boom/convert
|
||||||
|
|
||||||
## v4.1.6 (2022-07-04)
|
## v4.1.6 (2022-07-04)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -37,4 +37,4 @@ Copyright 2017 debugtalk
|
|||||||
* [hrp startproject](hrp_startproject.md) - create a scaffold project
|
* [hrp startproject](hrp_startproject.md) - create a scaffold project
|
||||||
* [hrp wiki](hrp_wiki.md) - visit https://httprunner.com
|
* [hrp wiki](hrp_wiki.md) - visit https://httprunner.com
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -41,5 +41,6 @@ hrp boom [flags]
|
|||||||
### SEE ALSO
|
### SEE ALSO
|
||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
||||||
|
* [hrp boom curl](hrp_boom_curl.md) - run load test with boomer by curl command
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
## hrp boom curl
|
||||||
|
|
||||||
|
run load test with boomer by curl command
|
||||||
|
|
||||||
|
```
|
||||||
|
hrp boom curl URLs [flags]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
```
|
||||||
|
-h, --help help for curl
|
||||||
|
```
|
||||||
|
|
||||||
|
### SEE ALSO
|
||||||
|
|
||||||
|
* [hrp boom](hrp_boom.md) - run load test with boomer
|
||||||
|
|
||||||
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
@@ -28,4 +28,4 @@ hrp build $path ... [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -21,5 +21,6 @@ hrp convert $path... [flags]
|
|||||||
### SEE ALSO
|
### SEE ALSO
|
||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [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 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
## hrp convert curl
|
||||||
|
|
||||||
|
convert curl command to httprunner testcase
|
||||||
|
|
||||||
|
```
|
||||||
|
hrp convert curl URLs [flags]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
```
|
||||||
|
-h, --help help for curl
|
||||||
|
```
|
||||||
|
|
||||||
|
### SEE ALSO
|
||||||
|
|
||||||
|
* [hrp convert](hrp_convert.md) - convert to JSON/YAML/gotest/pytest testcases
|
||||||
|
|
||||||
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
## hrp har2case
|
|
||||||
|
|
||||||
convert HAR to json/yaml testcase files
|
|
||||||
|
|
||||||
### Synopsis
|
|
||||||
|
|
||||||
convert HAR to json/yaml testcase files
|
|
||||||
|
|
||||||
```
|
|
||||||
hrp har2case $har_path... [flags]
|
|
||||||
```
|
|
||||||
|
|
||||||
### Options
|
|
||||||
|
|
||||||
```
|
|
||||||
-h, --help help for har2case
|
|
||||||
-d, --output-dir string specify output directory, default to the same dir with har file
|
|
||||||
-p, --profile string specify profile path to override headers and cookies
|
|
||||||
-j, --to-json convert to JSON format (default)
|
|
||||||
-y, --to-yaml convert to YAML format
|
|
||||||
```
|
|
||||||
|
|
||||||
### SEE ALSO
|
|
||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 29-May-2022
|
|
||||||
@@ -16,4 +16,4 @@ hrp pytest $path ... [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
+2
-1
@@ -34,5 +34,6 @@ hrp run $path... [flags]
|
|||||||
### SEE ALSO
|
### SEE ALSO
|
||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
||||||
|
* [hrp run curl](hrp_run_curl.md) - run API test with go engine by curl command
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
## hrp run curl
|
||||||
|
|
||||||
|
run API test with go engine by curl command
|
||||||
|
|
||||||
|
```
|
||||||
|
hrp run curl URLs [flags]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
```
|
||||||
|
-h, --help help for curl
|
||||||
|
```
|
||||||
|
|
||||||
|
### SEE ALSO
|
||||||
|
|
||||||
|
* [hrp run](hrp_run.md) - run API test with go engine
|
||||||
|
|
||||||
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
@@ -21,4 +21,4 @@ hrp startproject $project_name [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -16,4 +16,4 @@ hrp wiki [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
* [hrp](hrp.md) - Next-Generation API Testing Solution.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 4-Jul-2022
|
###### Auto generated by spf13/cobra on 22-Jul-2022
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
curl httpbin.org
|
||||||
|
|
||||||
|
curl https://httpbin.org/get?key1=value1&key2=value2
|
||||||
|
|
||||||
|
curl -H "Content-Type: application/json" \
|
||||||
|
-H "Authorization: Bearer b7d03a6947b217efb6f3ec3bd3504582" \
|
||||||
|
-d '{"type":"A","name":"www","data":"162.10.66.0","priority":null,"port":null,"weight":null}' \
|
||||||
|
"https://httpbin.org/post"
|
||||||
|
|
||||||
|
curl -F "dummyName=dummyFile" -F file1=@file1.txt -F file2=@file2.txt https://httpbin.org/post
|
||||||
|
|
||||||
|
curl https://httpbin.org/post \
|
||||||
|
-d 'shipment[to_address][id]=adr_HrBKVA85' \
|
||||||
|
-d 'shipment[from_address][id]=adr_VtuTOj7o' \
|
||||||
|
-d 'shipment[parcel][id]=prcl_WDv2VzHp' \
|
||||||
|
-d 'shipment[is_return]=true' \
|
||||||
|
-d 'shipment[customs_info][id]=cstinfo_bl5sE20Y'
|
||||||
|
|
||||||
|
curl https://httpbing.org/post -H "Content-Type: application/x-www-form-urlencoded" \
|
||||||
|
--data "key1=value+1&key2=value%3A2"
|
||||||
|
|
||||||
@@ -1,223 +0,0 @@
|
|||||||
{
|
|
||||||
"log": {
|
|
||||||
"version": "1.2",
|
|
||||||
"creator": {
|
|
||||||
"name": "Charles Proxy",
|
|
||||||
"version": "4.2.1"
|
|
||||||
},
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"startedDateTime": "2018-02-19T17:30:00.904+08:00",
|
|
||||||
"time": 3,
|
|
||||||
"request": {
|
|
||||||
"method": "POST",
|
|
||||||
"url": "http://127.0.0.1:5000/api/get-token",
|
|
||||||
"httpVersion": "HTTP/1.1",
|
|
||||||
"cookies": [],
|
|
||||||
"headers": [
|
|
||||||
{
|
|
||||||
"name": "Host",
|
|
||||||
"value": "127.0.0.1:5000"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "User-Agent",
|
|
||||||
"value": "python-requests/2.18.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept-Encoding",
|
|
||||||
"value": "gzip, deflate"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept",
|
|
||||||
"value": "*/*"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Connection",
|
|
||||||
"value": "keep-alive"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "device_sn",
|
|
||||||
"value": "FwgRiO7CNA50DSU"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "user_agent",
|
|
||||||
"value": "iOS/10.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "os_platform",
|
|
||||||
"value": "ios"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "app_version",
|
|
||||||
"value": "2.8.6"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Length",
|
|
||||||
"value": "52"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Type",
|
|
||||||
"value": "application/json"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"queryString": [],
|
|
||||||
"postData": {
|
|
||||||
"mimeType": "application/json",
|
|
||||||
"text": "{\"sign\": \"958a05393efef0ac7c0fb80a7eac45e24fd40c27\"}"
|
|
||||||
},
|
|
||||||
"headersSize": 299,
|
|
||||||
"bodySize": 52
|
|
||||||
},
|
|
||||||
"response": {
|
|
||||||
"_charlesStatus": "COMPLETE",
|
|
||||||
"status": 200,
|
|
||||||
"statusText": "OK",
|
|
||||||
"httpVersion": "HTTP/1.0",
|
|
||||||
"cookies": [],
|
|
||||||
"headers": [
|
|
||||||
{
|
|
||||||
"name": "Content-Type",
|
|
||||||
"value": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Length",
|
|
||||||
"value": "46"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Server",
|
|
||||||
"value": "Werkzeug/0.14.1 Python/3.6.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Date",
|
|
||||||
"value": "Mon, 19 Feb 2018 09:30:00 GMT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Proxy-Connection",
|
|
||||||
"value": "Close"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"content": {
|
|
||||||
"size": 46,
|
|
||||||
"mimeType": "application/json",
|
|
||||||
"text": "eyJzdWNjZXNzIjogdHJ1ZSwgInRva2VuIjogImJhTkxYMXpoRllQMTFTZWIifQ\u003d\u003d",
|
|
||||||
"encoding": "base64"
|
|
||||||
},
|
|
||||||
"headersSize": 175,
|
|
||||||
"bodySize": 46
|
|
||||||
},
|
|
||||||
"serverIPAddress": "127.0.0.1",
|
|
||||||
"cache": {},
|
|
||||||
"timings": {
|
|
||||||
"dns": 1,
|
|
||||||
"connect": 0,
|
|
||||||
"ssl": -1,
|
|
||||||
"send": 0,
|
|
||||||
"wait": 1,
|
|
||||||
"receive": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"startedDateTime": "2018-02-19T17:30:00.911+08:00",
|
|
||||||
"time": 3,
|
|
||||||
"request": {
|
|
||||||
"method": "POST",
|
|
||||||
"url": "http://127.0.0.1:5000/api/users/1000",
|
|
||||||
"httpVersion": "HTTP/1.1",
|
|
||||||
"cookies": [],
|
|
||||||
"headers": [
|
|
||||||
{
|
|
||||||
"name": "Host",
|
|
||||||
"value": "127.0.0.1:5000"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "User-Agent",
|
|
||||||
"value": "python-requests/2.18.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept-Encoding",
|
|
||||||
"value": "gzip, deflate"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept",
|
|
||||||
"value": "*/*"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Connection",
|
|
||||||
"value": "keep-alive"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "device_sn",
|
|
||||||
"value": "FwgRiO7CNA50DSU"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "token",
|
|
||||||
"value": "baNLX1zhFYP11Seb"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Length",
|
|
||||||
"value": "39"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Type",
|
|
||||||
"value": "application/json"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"queryString": [],
|
|
||||||
"postData": {
|
|
||||||
"mimeType": "application/json",
|
|
||||||
"text": "{\"name\": \"user1\", \"password\": \"123456\"}"
|
|
||||||
},
|
|
||||||
"headersSize": 265,
|
|
||||||
"bodySize": 39
|
|
||||||
},
|
|
||||||
"response": {
|
|
||||||
"_charlesStatus": "COMPLETE",
|
|
||||||
"status": 201,
|
|
||||||
"statusText": "CREATED",
|
|
||||||
"httpVersion": "HTTP/1.0",
|
|
||||||
"cookies": [],
|
|
||||||
"headers": [
|
|
||||||
{
|
|
||||||
"name": "Content-Type",
|
|
||||||
"value": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Length",
|
|
||||||
"value": "54"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Server",
|
|
||||||
"value": "Werkzeug/0.14.1 Python/3.6.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Date",
|
|
||||||
"value": "Mon, 19 Feb 2018 09:30:00 GMT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Proxy-Connection",
|
|
||||||
"value": "Close"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"content": {
|
|
||||||
"size": 54,
|
|
||||||
"mimeType": "application/json",
|
|
||||||
"text": "eyJzdWNjZXNzIjogdHJ1ZSwgIm1zZyI6ICJ1c2VyIGNyZWF0ZWQgc3VjY2Vzc2Z1bGx5LiJ9",
|
|
||||||
"encoding": "base64"
|
|
||||||
},
|
|
||||||
"headersSize": 77,
|
|
||||||
"bodySize": 54
|
|
||||||
},
|
|
||||||
"serverIPAddress": "127.0.0.1",
|
|
||||||
"cache": {},
|
|
||||||
"timings": {
|
|
||||||
"dns": 0,
|
|
||||||
"connect": 0,
|
|
||||||
"ssl": -1,
|
|
||||||
"send": 0,
|
|
||||||
"wait": 3,
|
|
||||||
"receive": 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
{
|
|
||||||
"log": {
|
|
||||||
"version": "1.2",
|
|
||||||
"creator": {
|
|
||||||
"name": "Charles Proxy",
|
|
||||||
"version": "4.2"
|
|
||||||
},
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"startedDateTime": "2017-11-13T11:40:07.212+08:00",
|
|
||||||
"time": 35,
|
|
||||||
"request": {
|
|
||||||
"method": "POST",
|
|
||||||
"url": "https://httprunner.top/api/v1/Account/Login",
|
|
||||||
"httpVersion": "HTTP/1.1",
|
|
||||||
"cookies": [
|
|
||||||
{
|
|
||||||
"name": "lang",
|
|
||||||
"value": "zh"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"headers": [
|
|
||||||
{
|
|
||||||
"name": "Host",
|
|
||||||
"value": "httprunner.top"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Connection",
|
|
||||||
"value": "keep-alive"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Length",
|
|
||||||
"value": "50"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept",
|
|
||||||
"value": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Origin",
|
|
||||||
"value": "https://httprunner.top"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "User-Agent",
|
|
||||||
"value": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Type",
|
|
||||||
"value": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Referer",
|
|
||||||
"value": "https://httprunner.top/login"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept-Encoding",
|
|
||||||
"value": "gzip, deflate, br"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Accept-Language",
|
|
||||||
"value": "en-US,en;q=0.8,zh-CN;q=0.6,zh;q=0.4"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"queryString": [],
|
|
||||||
"postData": {
|
|
||||||
"mimeType": "application/json",
|
|
||||||
"text": "{\"UserName\":\"test001\",\"Pwd\":\"123\",\"VerCode\":\"\"}"
|
|
||||||
},
|
|
||||||
"headersSize": 640,
|
|
||||||
"bodySize": 50
|
|
||||||
},
|
|
||||||
"response": {
|
|
||||||
"_charlesStatus": "COMPLETE",
|
|
||||||
"status": 200,
|
|
||||||
"statusText": "OK",
|
|
||||||
"httpVersion": "HTTP/1.1",
|
|
||||||
"cookies": [
|
|
||||||
{
|
|
||||||
"name": "lang",
|
|
||||||
"value": "zh",
|
|
||||||
"path": "/",
|
|
||||||
"domain": ".httprunner.top",
|
|
||||||
"expires": null,
|
|
||||||
"httpOnly": false,
|
|
||||||
"secure": false,
|
|
||||||
"comment": null,
|
|
||||||
"_maxAge": null
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"headers": [
|
|
||||||
{
|
|
||||||
"name": "Date",
|
|
||||||
"value": "Mon, 13 Nov 2017 03:40:07 GMT"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Type",
|
|
||||||
"value": "application/json; charset=utf-8"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Content-Length",
|
|
||||||
"value": "71"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Cache-Control",
|
|
||||||
"value": "no-cache"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Pragma",
|
|
||||||
"value": "no-cache"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Expires",
|
|
||||||
"value": "-1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Server",
|
|
||||||
"value": "Microsoft-IIS/8.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "X-AspNet-Version",
|
|
||||||
"value": "4.0.30319"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"content": {
|
|
||||||
"size": 71,
|
|
||||||
"mimeType": "application/json; charset=utf-8",
|
|
||||||
"text": "eyJJc1N1Y2Nlc3MiOnRydWUsIkNvZGUiOjIwMCwiTWVzc2FnZSI6bnVsbCwiVmFsdWUiOnsiQmxuUmVzdWx0Ijp0cnVlfX0=",
|
|
||||||
"encoding": "base64"
|
|
||||||
},
|
|
||||||
"redirectURL": null,
|
|
||||||
"headersSize": 0,
|
|
||||||
"bodySize": 71
|
|
||||||
},
|
|
||||||
"serverIPAddress": "192.168.1.169",
|
|
||||||
"cache": {},
|
|
||||||
"timings": {
|
|
||||||
"dns": -1,
|
|
||||||
"connect": -1,
|
|
||||||
"ssl": -1,
|
|
||||||
"send": 6,
|
|
||||||
"wait": 28,
|
|
||||||
"receive": 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"project_name": "demo-with-go-plugin",
|
"project_name": "demo-with-go-plugin",
|
||||||
"create_time": "2022-07-04T14:53:59.755944+08:00",
|
"create_time": "2022-07-06T13:57:04.054424+08:00",
|
||||||
"hrp_version": "v4.1.5"
|
"hrp_version": "v4.1.6"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"project_name": "demo-with-py-plugin",
|
"project_name": "demo-with-py-plugin",
|
||||||
"create_time": "2022-07-04T14:54:00.346082+08:00",
|
"create_time": "2022-07-06T13:57:04.482633+08:00",
|
||||||
"hrp_version": "v4.1.5"
|
"hrp_version": "v4.1.6"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ require (
|
|||||||
github.com/fatih/color v1.13.0
|
github.com/fatih/color v1.13.0
|
||||||
github.com/getsentry/sentry-go v0.13.0
|
github.com/getsentry/sentry-go v0.13.0
|
||||||
github.com/go-openapi/spec v0.20.6
|
github.com/go-openapi/spec v0.20.6
|
||||||
|
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
|
||||||
github.com/google/uuid v1.3.0
|
github.com/google/uuid v1.3.0
|
||||||
github.com/gorilla/websocket v1.4.1
|
github.com/gorilla/websocket v1.4.1
|
||||||
github.com/httprunner/funplugin v0.5.0
|
github.com/httprunner/funplugin v0.5.0
|
||||||
|
|||||||
@@ -216,6 +216,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
|
|||||||
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
||||||
|
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
|
||||||
|
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
|
||||||
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
|
||||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
|||||||
+34
-29
@@ -35,35 +35,7 @@ var boomCmd = &cobra.Command{
|
|||||||
path := hrp.TestCasePath(arg)
|
path := hrp.TestCasePath(arg)
|
||||||
paths = append(paths, &path)
|
paths = append(paths, &path)
|
||||||
}
|
}
|
||||||
// if set profile, the priority is higher than the other commands
|
hrpBoomer := makeHRPBoomer()
|
||||||
if boomArgs.profile != "" {
|
|
||||||
err := builtin.LoadFile(boomArgs.profile, &boomArgs)
|
|
||||||
if err != nil {
|
|
||||||
log.Error().Err(err).Msg("failed to load profile")
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hrpBoomer := hrp.NewBoomer(boomArgs.SpawnCount, boomArgs.SpawnRate)
|
|
||||||
hrpBoomer.SetRateLimiter(boomArgs.MaxRPS, boomArgs.RequestIncreaseRate)
|
|
||||||
if boomArgs.LoopCount > 0 {
|
|
||||||
hrpBoomer.SetLoopCount(boomArgs.LoopCount)
|
|
||||||
}
|
|
||||||
if !boomArgs.DisableConsoleOutput {
|
|
||||||
hrpBoomer.AddOutput(boomer.NewConsoleOutput())
|
|
||||||
}
|
|
||||||
if boomArgs.PrometheusPushgatewayURL != "" {
|
|
||||||
hrpBoomer.AddOutput(boomer.NewPrometheusPusherOutput(boomArgs.PrometheusPushgatewayURL, "hrp", hrpBoomer.GetMode()))
|
|
||||||
}
|
|
||||||
hrpBoomer.SetDisableKeepAlive(boomArgs.DisableKeepalive)
|
|
||||||
hrpBoomer.SetDisableCompression(boomArgs.DisableCompression)
|
|
||||||
hrpBoomer.SetClientTransport()
|
|
||||||
if venv != "" {
|
|
||||||
hrpBoomer.SetPython3Venv(venv)
|
|
||||||
}
|
|
||||||
hrpBoomer.EnableCPUProfile(boomArgs.CPUProfile, boomArgs.CPUProfileDuration)
|
|
||||||
hrpBoomer.EnableMemoryProfile(boomArgs.MemoryProfile, boomArgs.MemoryProfileDuration)
|
|
||||||
hrpBoomer.EnableGracefulQuit()
|
|
||||||
hrpBoomer.Run(paths...)
|
hrpBoomer.Run(paths...)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -105,3 +77,36 @@ func init() {
|
|||||||
boomCmd.Flags().BoolVar(&boomArgs.DisableKeepalive, "disable-keepalive", false, "Disable keepalive")
|
boomCmd.Flags().BoolVar(&boomArgs.DisableKeepalive, "disable-keepalive", false, "Disable keepalive")
|
||||||
boomCmd.Flags().StringVar(&boomArgs.profile, "profile", "", "profile for load testing")
|
boomCmd.Flags().StringVar(&boomArgs.profile, "profile", "", "profile for load testing")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func makeHRPBoomer() *hrp.HRPBoomer {
|
||||||
|
// if set profile, the priority is higher than the other commands
|
||||||
|
if boomArgs.profile != "" {
|
||||||
|
err := builtin.LoadFile(boomArgs.profile, &boomArgs)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msg("failed to load profile")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
hrpBoomer := hrp.NewBoomer(boomArgs.SpawnCount, boomArgs.SpawnRate)
|
||||||
|
hrpBoomer.SetRateLimiter(boomArgs.MaxRPS, boomArgs.RequestIncreaseRate)
|
||||||
|
if boomArgs.LoopCount > 0 {
|
||||||
|
hrpBoomer.SetLoopCount(boomArgs.LoopCount)
|
||||||
|
}
|
||||||
|
if !boomArgs.DisableConsoleOutput {
|
||||||
|
hrpBoomer.AddOutput(boomer.NewConsoleOutput())
|
||||||
|
}
|
||||||
|
if boomArgs.PrometheusPushgatewayURL != "" {
|
||||||
|
hrpBoomer.AddOutput(boomer.NewPrometheusPusherOutput(boomArgs.PrometheusPushgatewayURL, "hrp", hrpBoomer.GetMode()))
|
||||||
|
}
|
||||||
|
hrpBoomer.SetDisableKeepAlive(boomArgs.DisableKeepalive)
|
||||||
|
hrpBoomer.SetDisableCompression(boomArgs.DisableCompression)
|
||||||
|
hrpBoomer.SetClientTransport()
|
||||||
|
if venv != "" {
|
||||||
|
hrpBoomer.SetPython3Venv(venv)
|
||||||
|
}
|
||||||
|
hrpBoomer.EnableCPUProfile(boomArgs.CPUProfile, boomArgs.CPUProfileDuration)
|
||||||
|
hrpBoomer.EnableMemoryProfile(boomArgs.MemoryProfile, boomArgs.MemoryProfileDuration)
|
||||||
|
hrpBoomer.EnableGracefulQuit()
|
||||||
|
return hrpBoomer
|
||||||
|
}
|
||||||
|
|||||||
+25
-22
@@ -19,9 +19,32 @@ var convertCmd = &cobra.Command{
|
|||||||
PreRun: func(cmd *cobra.Command, args []string) {
|
PreRun: func(cmd *cobra.Command, args []string) {
|
||||||
setLogLevel(logLevel)
|
setLogLevel(logLevel)
|
||||||
},
|
},
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: convertRun,
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
toJSONFlag bool
|
||||||
|
toYAMLFlag bool
|
||||||
|
toGoTestFlag bool
|
||||||
|
toPyTestFlag bool
|
||||||
|
outputDir string
|
||||||
|
profilePath string
|
||||||
|
|
||||||
|
outputType convert.OutputType
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rootCmd.AddCommand(convertCmd)
|
||||||
|
convertCmd.Flags().BoolVar(&toPyTestFlag, "to-pytest", false, "convert to pytest scripts")
|
||||||
|
convertCmd.Flags().BoolVar(&toGoTestFlag, "to-gotest", false, "convert to gotest scripts (TODO)")
|
||||||
|
convertCmd.Flags().BoolVar(&toJSONFlag, "to-json", false, "convert to JSON scripts (default)")
|
||||||
|
convertCmd.Flags().BoolVar(&toYAMLFlag, "to-yaml", false, "convert to YAML scripts")
|
||||||
|
convertCmd.Flags().StringVarP(&outputDir, "output-dir", "d", "", "specify output directory, default to the same dir with har file")
|
||||||
|
convertCmd.Flags().StringVarP(&profilePath, "profile", "p", "", "specify profile path to override headers and cookies")
|
||||||
|
}
|
||||||
|
|
||||||
|
func convertRun(cmd *cobra.Command, args []string) error {
|
||||||
var flagCount int
|
var flagCount int
|
||||||
var outputType convert.OutputType
|
|
||||||
if toJSONFlag {
|
if toJSONFlag {
|
||||||
flagCount++
|
flagCount++
|
||||||
}
|
}
|
||||||
@@ -51,24 +74,4 @@ var convertCmd = &cobra.Command{
|
|||||||
}
|
}
|
||||||
convert.Run(outputType, outputDir, profilePath, args)
|
convert.Run(outputType, outputDir, profilePath, args)
|
||||||
return nil
|
return nil
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
toJSONFlag bool
|
|
||||||
toYAMLFlag bool
|
|
||||||
toGoTestFlag bool
|
|
||||||
toPyTestFlag bool
|
|
||||||
outputDir string
|
|
||||||
profilePath string
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(convertCmd)
|
|
||||||
convertCmd.Flags().BoolVar(&toPyTestFlag, "to-pytest", false, "convert to pytest scripts")
|
|
||||||
convertCmd.Flags().BoolVar(&toGoTestFlag, "to-gotest", false, "convert to gotest scripts (TODO)")
|
|
||||||
convertCmd.Flags().BoolVar(&toJSONFlag, "to-json", false, "convert to JSON scripts (default)")
|
|
||||||
convertCmd.Flags().BoolVar(&toYAMLFlag, "to-yaml", false, "convert to YAML scripts")
|
|
||||||
convertCmd.Flags().StringVarP(&outputDir, "output-dir", "d", "", "specify output directory, default to the same dir with har file")
|
|
||||||
convertCmd.Flags().StringVarP(&profilePath, "profile", "p", "", "specify profile path to override headers and cookies")
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp"
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp/internal/boomer"
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp/internal/convert"
|
||||||
|
)
|
||||||
|
|
||||||
|
var runCurlCmd = &cobra.Command{
|
||||||
|
Use: "curl URLs",
|
||||||
|
Short: "run API test with go engine by curl command",
|
||||||
|
Args: cobra.MinimumNArgs(1),
|
||||||
|
DisableFlagParsing: true,
|
||||||
|
PreRun: func(cmd *cobra.Command, args []string) {
|
||||||
|
setLogLevel(logLevel)
|
||||||
|
},
|
||||||
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
|
runner := makeHRPRunner()
|
||||||
|
if runner.Run(makeCurlTestCase(args)) != nil {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var boomCurlCmd = &cobra.Command{
|
||||||
|
Use: "curl URLs",
|
||||||
|
Short: "run load test with boomer by curl command",
|
||||||
|
Args: cobra.MinimumNArgs(1),
|
||||||
|
DisableFlagParsing: true,
|
||||||
|
PreRun: func(cmd *cobra.Command, args []string) {
|
||||||
|
boomer.SetUlimit(10240)
|
||||||
|
if !strings.EqualFold(logLevel, "DEBUG") {
|
||||||
|
logLevel = "WARN" // disable info logs for load testing
|
||||||
|
}
|
||||||
|
setLogLevel(logLevel)
|
||||||
|
},
|
||||||
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
|
boomer := makeHRPBoomer()
|
||||||
|
boomer.Run(makeCurlTestCase(args))
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var convertCurlCmd = &cobra.Command{
|
||||||
|
Use: "curl URLs",
|
||||||
|
Short: "convert curl command to httprunner testcase",
|
||||||
|
Args: cobra.MinimumNArgs(1),
|
||||||
|
DisableFlagParsing: true,
|
||||||
|
PreRun: func(cmd *cobra.Command, args []string) {
|
||||||
|
setLogLevel(logLevel)
|
||||||
|
},
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
curlCommand := makeCurlCommand(args)
|
||||||
|
return convertRun(cmd, []string{curlCommand})
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
runCmd.AddCommand(runCurlCmd)
|
||||||
|
boomCmd.AddCommand(boomCurlCmd)
|
||||||
|
convertCmd.AddCommand(convertCurlCmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeCurlTestCase(args []string) *hrp.TestCase {
|
||||||
|
curlCommand := makeCurlCommand(args)
|
||||||
|
tCase, err := convert.LoadSingleCurlCase(curlCommand)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msg("convert curl command failed")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
casePath, _ := os.Getwd()
|
||||||
|
testCase, err := tCase.ToTestCase(casePath)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msg("convert testcase to failed")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
return testCase
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeCurlCommand(args []string) string {
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
if !strings.HasPrefix(args[i], "-") {
|
||||||
|
args[i] = fmt.Sprintf("\"%s\"", args[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var curlCmd []string
|
||||||
|
curlCmd = append(curlCmd, "curl")
|
||||||
|
curlCmd = append(curlCmd, args...)
|
||||||
|
return strings.Join(curlCmd, " ")
|
||||||
|
}
|
||||||
@@ -43,6 +43,7 @@ Copyright 2017 debugtalk`,
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
Version: version.VERSION,
|
Version: version.VERSION,
|
||||||
|
TraverseChildren: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
+26
-21
@@ -26,27 +26,7 @@ var runCmd = &cobra.Command{
|
|||||||
path := hrp.TestCasePath(arg)
|
path := hrp.TestCasePath(arg)
|
||||||
paths = append(paths, &path)
|
paths = append(paths, &path)
|
||||||
}
|
}
|
||||||
runner := hrp.NewRunner(nil).
|
runner := makeHRPRunner()
|
||||||
SetFailfast(!continueOnFailure).
|
|
||||||
SetSaveTests(saveTests)
|
|
||||||
if genHTMLReport {
|
|
||||||
runner.GenHTMLReport()
|
|
||||||
}
|
|
||||||
if !requestsLogOff {
|
|
||||||
runner.SetRequestsLogOn()
|
|
||||||
}
|
|
||||||
if httpStatOn {
|
|
||||||
runner.SetHTTPStatOn()
|
|
||||||
}
|
|
||||||
if pluginLogOn {
|
|
||||||
runner.SetPluginLogOn()
|
|
||||||
}
|
|
||||||
if venv != "" {
|
|
||||||
runner.SetPython3Venv(venv)
|
|
||||||
}
|
|
||||||
if proxyUrl != "" {
|
|
||||||
runner.SetProxyUrl(proxyUrl)
|
|
||||||
}
|
|
||||||
err := runner.Run(paths...)
|
err := runner.Run(paths...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@@ -74,3 +54,28 @@ func init() {
|
|||||||
runCmd.Flags().BoolVarP(&saveTests, "save-tests", "s", false, "save tests summary")
|
runCmd.Flags().BoolVarP(&saveTests, "save-tests", "s", false, "save tests summary")
|
||||||
runCmd.Flags().BoolVarP(&genHTMLReport, "gen-html-report", "g", false, "generate html report")
|
runCmd.Flags().BoolVarP(&genHTMLReport, "gen-html-report", "g", false, "generate html report")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func makeHRPRunner() *hrp.HRPRunner {
|
||||||
|
runner := hrp.NewRunner(nil).
|
||||||
|
SetFailfast(!continueOnFailure).
|
||||||
|
SetSaveTests(saveTests)
|
||||||
|
if genHTMLReport {
|
||||||
|
runner.GenHTMLReport()
|
||||||
|
}
|
||||||
|
if !requestsLogOff {
|
||||||
|
runner.SetRequestsLogOn()
|
||||||
|
}
|
||||||
|
if httpStatOn {
|
||||||
|
runner.SetHTTPStatOn()
|
||||||
|
}
|
||||||
|
if pluginLogOn {
|
||||||
|
runner.SetPluginLogOn()
|
||||||
|
}
|
||||||
|
if venv != "" {
|
||||||
|
runner.SetPython3Venv(venv)
|
||||||
|
}
|
||||||
|
if proxyUrl != "" {
|
||||||
|
runner.SetProxyUrl(proxyUrl)
|
||||||
|
}
|
||||||
|
return runner
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package builtin
|
package builtin
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/csv"
|
"encoding/csv"
|
||||||
builtinJSON "encoding/json"
|
builtinJSON "encoding/json"
|
||||||
@@ -450,6 +451,40 @@ func ReadFile(path string) ([]byte, error) {
|
|||||||
return file, nil
|
return file, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ReadCmdLines(path string) ([]string, error) {
|
||||||
|
var err error
|
||||||
|
path, err = filepath.Abs(path)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Str("path", path).Msg("convert absolute path failed")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
file, err := os.Open(path)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Str("path", path).Msg("open file failed")
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
var line string
|
||||||
|
var lines []string
|
||||||
|
scanner := bufio.NewScanner(file)
|
||||||
|
// FIXME: resize scanner's capacity for lines over 64K
|
||||||
|
for scanner.Scan() {
|
||||||
|
text := strings.TrimSpace(scanner.Text())
|
||||||
|
if text == "" || text == "\n" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(text, "\\") {
|
||||||
|
line = line + strings.Trim(text, "\\")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
line = line + text
|
||||||
|
lines = append(lines, line)
|
||||||
|
line = ""
|
||||||
|
}
|
||||||
|
return lines, scanner.Err()
|
||||||
|
}
|
||||||
|
|
||||||
func GetFileNameWithoutExtension(path string) string {
|
func GetFileNameWithoutExtension(path string) string {
|
||||||
base := filepath.Base(path)
|
base := filepath.Base(path)
|
||||||
ext := filepath.Ext(base)
|
ext := filepath.Ext(base)
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ cookies:
|
|||||||
| Postman | ✅ | ✅ | ❌ | ✅ |
|
| Postman | ✅ | ✅ | ❌ | ✅ |
|
||||||
| JMeter | ❌ | ❌ | ❌ | ❌ |
|
| JMeter | ❌ | ❌ | ❌ | ❌ |
|
||||||
| Swagger | ❌ | ❌ | ❌ | ❌ |
|
| Swagger | ❌ | ❌ | ❌ | ❌ |
|
||||||
| curl | ❌ | ❌ | ❌ | ❌ |
|
| curl | ✅ | ✅ | ❌ | ✅ |
|
||||||
| Apache ab | ❌ | ❌ | ❌ | ❌ |
|
| Apache ab | ❌ | ❌ | ❌ | ❌ |
|
||||||
| JSON | ✅ | ✅ | ❌ | ✅ |
|
| JSON | ✅ | ✅ | ❌ | ✅ |
|
||||||
| YAML | ✅ | ✅ | ❌ | ✅ |
|
| YAML | ✅ | ✅ | ❌ | ✅ |
|
||||||
|
|||||||
@@ -3,7 +3,10 @@ package convert
|
|||||||
import (
|
import (
|
||||||
_ "embed"
|
_ "embed"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
@@ -58,16 +61,16 @@ func Run(outputType OutputType, outputDir, profilePath string, args []string) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
var outputFiles []string
|
var outputFiles []string
|
||||||
for _, path := range args {
|
for _, inputSample := range args {
|
||||||
// loads source file and convert to TCase format
|
// loads source file and convert to TCase format
|
||||||
tCase, err := LoadTCase(path)
|
tCase, err := LoadTCase(inputSample)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warn().Err(err).Str("path", path).Msg("convert source file failed")
|
log.Warn().Err(err).Str("input sample", inputSample).Msg("convert input sample failed")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
caseConverter := &TCaseConverter{
|
caseConverter := &TCaseConverter{
|
||||||
SourcePath: path,
|
InputSample: inputSample,
|
||||||
OutputDir: outputDir,
|
OutputDir: outputDir,
|
||||||
TCase: tCase,
|
TCase: tCase,
|
||||||
}
|
}
|
||||||
@@ -91,7 +94,7 @@ func Run(outputType OutputType, outputDir, profilePath string, args []string) {
|
|||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Err(err).
|
log.Error().Err(err).
|
||||||
Str("source path", path).
|
Str("input sample", caseConverter.InputSample).
|
||||||
Msg("convert case failed")
|
Msg("convert case failed")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -101,14 +104,22 @@ func Run(outputType OutputType, outputDir, profilePath string, args []string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// LoadTCase loads source file and convert to TCase type
|
// LoadTCase loads source file and convert to TCase type
|
||||||
func LoadTCase(path string) (*hrp.TCase, error) {
|
func LoadTCase(inputSample string) (*hrp.TCase, error) {
|
||||||
extName := filepath.Ext(path)
|
if strings.HasPrefix(inputSample, "curl ") {
|
||||||
|
// 'path' contains curl command
|
||||||
|
curlCase, err := LoadSingleCurlCase(inputSample)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return curlCase, nil
|
||||||
|
}
|
||||||
|
extName := filepath.Ext(inputSample)
|
||||||
if extName == "" {
|
if extName == "" {
|
||||||
return nil, errors.New("file extension is not specified")
|
return nil, errors.New("file extension is not specified")
|
||||||
}
|
}
|
||||||
switch extName {
|
switch extName {
|
||||||
case ".har":
|
case ".har":
|
||||||
tCase, err := LoadHARCase(path)
|
tCase, err := LoadHARCase(inputSample)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -116,19 +127,19 @@ func LoadTCase(path string) (*hrp.TCase, error) {
|
|||||||
case ".json":
|
case ".json":
|
||||||
// priority: hrp JSON case > postman > swagger
|
// priority: hrp JSON case > postman > swagger
|
||||||
// check if hrp JSON case
|
// check if hrp JSON case
|
||||||
tCase, err := LoadJSONCase(path)
|
tCase, err := LoadJSONCase(inputSample)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return tCase, nil
|
return tCase, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if postman format
|
// check if postman format
|
||||||
casePostman, err := LoadPostmanCase(path)
|
casePostman, err := LoadPostmanCase(inputSample)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return casePostman, nil
|
return casePostman, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if swagger format
|
// check if swagger format
|
||||||
caseSwagger, err := LoadSwaggerCase(path)
|
caseSwagger, err := LoadSwaggerCase(inputSample)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return caseSwagger, nil
|
return caseSwagger, nil
|
||||||
}
|
}
|
||||||
@@ -137,13 +148,13 @@ func LoadTCase(path string) (*hrp.TCase, error) {
|
|||||||
case ".yaml", ".yml":
|
case ".yaml", ".yml":
|
||||||
// priority: hrp YAML case > swagger
|
// priority: hrp YAML case > swagger
|
||||||
// check if hrp YAML case
|
// check if hrp YAML case
|
||||||
tCase, err := NewYAMLCase(path)
|
tCase, err := NewYAMLCase(inputSample)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return tCase, nil
|
return tCase, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if swagger format
|
// check if swagger format
|
||||||
caseSwagger, err := LoadSwaggerCase(path)
|
caseSwagger, err := LoadSwaggerCase(inputSample)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return caseSwagger, nil
|
return caseSwagger, nil
|
||||||
}
|
}
|
||||||
@@ -155,6 +166,12 @@ func LoadTCase(path string) (*hrp.TCase, error) {
|
|||||||
return nil, errors.New("convert pytest is not implemented")
|
return nil, errors.New("convert pytest is not implemented")
|
||||||
case ".jmx": // TODO
|
case ".jmx": // TODO
|
||||||
return nil, errors.New("convert JMeter jmx is not implemented")
|
return nil, errors.New("convert JMeter jmx is not implemented")
|
||||||
|
case ".txt":
|
||||||
|
curlCase, err := LoadCurlCase(inputSample)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return curlCase, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, fmt.Errorf("unsupported file type: %v", extName)
|
return nil, fmt.Errorf("unsupported file type: %v", extName)
|
||||||
@@ -162,17 +179,27 @@ func LoadTCase(path string) (*hrp.TCase, error) {
|
|||||||
|
|
||||||
// TCaseConverter holds the common properties of case converter
|
// TCaseConverter holds the common properties of case converter
|
||||||
type TCaseConverter struct {
|
type TCaseConverter struct {
|
||||||
SourcePath string
|
InputSample string
|
||||||
OutputDir string
|
OutputDir string
|
||||||
TCase *hrp.TCase
|
TCase *hrp.TCase
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *TCaseConverter) genOutputPath(suffix string) string {
|
func (c *TCaseConverter) genOutputPath(suffix string) string {
|
||||||
outFileFullName := builtin.GetFileNameWithoutExtension(c.SourcePath) + "_test" + suffix
|
var outFileFullName string
|
||||||
|
if curlCmd := strings.TrimSpace(c.InputSample); strings.HasPrefix(curlCmd, "curl ") {
|
||||||
|
outFileFullName = fmt.Sprintf("curl_%v_test%v", time.Now().Format("20060102150405"), suffix)
|
||||||
if c.OutputDir != "" {
|
if c.OutputDir != "" {
|
||||||
return filepath.Join(c.OutputDir, outFileFullName)
|
return filepath.Join(c.OutputDir, outFileFullName)
|
||||||
} else {
|
} else {
|
||||||
return filepath.Join(filepath.Dir(c.SourcePath), outFileFullName)
|
curWorkDir, _ := os.Getwd()
|
||||||
|
return filepath.Join(curWorkDir, outFileFullName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
outFileFullName = builtin.GetFileNameWithoutExtension(c.InputSample) + "_test" + suffix
|
||||||
|
if c.OutputDir != "" {
|
||||||
|
return filepath.Join(c.OutputDir, outFileFullName)
|
||||||
|
} else {
|
||||||
|
return filepath.Join(filepath.Dir(c.InputSample), outFileFullName)
|
||||||
}
|
}
|
||||||
// TODO avoid outFileFullName conflict?
|
// TODO avoid outFileFullName conflict?
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,501 @@
|
|||||||
|
package convert
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/google/shlex"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp"
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp/internal/builtin"
|
||||||
|
"github.com/httprunner/httprunner/v4/hrp/internal/json"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
originCmdKey = "_origin_cmd_key"
|
||||||
|
targetUrlKey = "_target_url_key"
|
||||||
|
)
|
||||||
|
|
||||||
|
var curlOptionAliasMap = map[string]string{
|
||||||
|
"-a": "--append",
|
||||||
|
"-A": "--user-agent",
|
||||||
|
"-b": "--cookie",
|
||||||
|
"-B": "--use-ascii",
|
||||||
|
"-c": "--cookie-jar",
|
||||||
|
"-C": "--continue-at",
|
||||||
|
"-d": "--data",
|
||||||
|
"-D": "--dump-header",
|
||||||
|
"-e": "--referer",
|
||||||
|
"-E": "--cert",
|
||||||
|
"-f": "--fail",
|
||||||
|
"-F": "--form",
|
||||||
|
"-g": "--globoff",
|
||||||
|
"-G": "--get",
|
||||||
|
"-h": "--help",
|
||||||
|
"-H": "--header",
|
||||||
|
"-i": "--include",
|
||||||
|
"-I": "--head",
|
||||||
|
"-j": "--junk-session-cookies",
|
||||||
|
"-J": "--remote-header-name",
|
||||||
|
"-k": "--insecure",
|
||||||
|
"-K": "--config",
|
||||||
|
"-l": "--list-only",
|
||||||
|
"-L": "--location",
|
||||||
|
"-m": "--max-time",
|
||||||
|
"-M": "--manual",
|
||||||
|
"-n": "--netrc",
|
||||||
|
"-N": "--no-buffer",
|
||||||
|
"-o": "--output",
|
||||||
|
"-O": "--remote-name",
|
||||||
|
"-p": "--proxytunnel",
|
||||||
|
"-P": "--ftp-port",
|
||||||
|
"-q": "--disable",
|
||||||
|
"-Q": "--quote",
|
||||||
|
"-r": "--range",
|
||||||
|
"-R": "--remote-time",
|
||||||
|
"-s": "--silent",
|
||||||
|
"-S": "--show-error",
|
||||||
|
"-t": "--telnet-option",
|
||||||
|
"-T": "--upload-file",
|
||||||
|
"-u": "--user",
|
||||||
|
"-U": "--proxy-user",
|
||||||
|
"-v": "--verbose",
|
||||||
|
"-V": "--version",
|
||||||
|
"-w": "--write-out",
|
||||||
|
"-x": "--proxy",
|
||||||
|
"-X": "--request",
|
||||||
|
"-Y": "--speed-limit",
|
||||||
|
"-y": "--speed-time",
|
||||||
|
"-z": "--time-cond",
|
||||||
|
"-Z": "--parallel",
|
||||||
|
}
|
||||||
|
|
||||||
|
var curlOptionWhiteMap = map[string]struct{}{
|
||||||
|
"--cookie": {},
|
||||||
|
"--data": {},
|
||||||
|
"--form": {},
|
||||||
|
"--get": {},
|
||||||
|
"--head": {},
|
||||||
|
"--header": {},
|
||||||
|
"--request": {},
|
||||||
|
}
|
||||||
|
|
||||||
|
var curlOptionWhiteList []string
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
for option := range curlOptionWhiteMap {
|
||||||
|
curlOptionWhiteList = append(curlOptionWhiteList, option)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadCurlCase loads testcase from one or more curl commands in .txt file
|
||||||
|
func LoadCurlCase(path string) (*hrp.TCase, error) {
|
||||||
|
cmds, err := builtin.ReadCmdLines(path)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
tCase := &hrp.TCase{
|
||||||
|
Config: &hrp.TConfig{Name: "testcase converted from curl command"},
|
||||||
|
}
|
||||||
|
for _, cmd := range cmds {
|
||||||
|
tSteps, err := LoadCurlSteps(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
tCase.TestSteps = append(tCase.TestSteps, tSteps...)
|
||||||
|
}
|
||||||
|
err = tCase.MakeCompat()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return tCase, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadSingleCurlCase one testcase from one curl command
|
||||||
|
func LoadSingleCurlCase(cmd string) (*hrp.TCase, error) {
|
||||||
|
tSteps, err := LoadCurlSteps(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
tCase := &hrp.TCase{
|
||||||
|
Config: &hrp.TConfig{Name: "testcase converted from curl command"},
|
||||||
|
TestSteps: tSteps,
|
||||||
|
}
|
||||||
|
err = tCase.MakeCompat()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return tCase, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadCurlSteps loads one teststep from one curl command
|
||||||
|
func LoadCurlSteps(cmd string) ([]*hrp.TStep, error) {
|
||||||
|
caseCurl, err := loadCaseCurl(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return caseCurl.toTSteps()
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadCaseCurl(cmd string) (CaseCurl, error) {
|
||||||
|
caseCurl := make(CaseCurl)
|
||||||
|
var err error
|
||||||
|
caseCurl, err = parseCaseCurl(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.Wrap(err, "load curl command failed")
|
||||||
|
}
|
||||||
|
// deal with option alias, turn all options to long form
|
||||||
|
if err = caseCurl.toAlias(); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "identify curl option alias failed")
|
||||||
|
}
|
||||||
|
// check if caseCurl contains unsupported args
|
||||||
|
if err = caseCurl.checkOptions(); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "check curl option failed")
|
||||||
|
}
|
||||||
|
caseCurl.Set(originCmdKey, cmd)
|
||||||
|
return caseCurl, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseCaseCurl parses command string to map, save command keyword and bool option as map key only.
|
||||||
|
// Otherwise, save option as map key and the following args([]string) as map value
|
||||||
|
func parseCaseCurl(cmd string) (CaseCurl, error) {
|
||||||
|
cmdWords, err := shlex.Split(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse the command string to map
|
||||||
|
res := make(CaseCurl)
|
||||||
|
var i int
|
||||||
|
if cmdWords[i] != "curl" {
|
||||||
|
return nil, errors.New("command not started with curl")
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
for i < len(cmdWords) {
|
||||||
|
if !strings.HasPrefix(cmdWords[i], "-") {
|
||||||
|
// save target url
|
||||||
|
res.Add(targetUrlKey, cmdWords[i])
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
option := cmdWords[i]
|
||||||
|
i++
|
||||||
|
if i < len(cmdWords) && !strings.HasPrefix(cmdWords[i], "-") {
|
||||||
|
// option with only one following argument
|
||||||
|
res.Add(option, cmdWords[i])
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// option with no argument, i.e. bool option, save key only
|
||||||
|
res[option] = nil
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type CaseCurl map[string][]string
|
||||||
|
|
||||||
|
// Get gets the first value associated with the given key.
|
||||||
|
// If there are no values associated with the key, Get returns the empty string.
|
||||||
|
func (c CaseCurl) Get(key string, index int) string {
|
||||||
|
if c == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
vs := c[key]
|
||||||
|
if index >= 0 && index < len(vs) {
|
||||||
|
return vs[index]
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c CaseCurl) Set(key, value string) {
|
||||||
|
c[key] = []string{value}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c CaseCurl) Add(key, value string) {
|
||||||
|
c[key] = append(c[key], value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HaveKey checks key existed or not
|
||||||
|
func (c CaseCurl) HaveKey(key string) bool {
|
||||||
|
if c == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
_, ok := c[key]
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c CaseCurl) toAlias() error {
|
||||||
|
for option, args := range c {
|
||||||
|
if !strings.HasPrefix(option, "-") || strings.HasPrefix(option, "--") {
|
||||||
|
// not a short option like -X, pass
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
longOption, ok := curlOptionAliasMap[option]
|
||||||
|
if !ok {
|
||||||
|
return errors.Errorf("unexpected curl option: %v", option)
|
||||||
|
}
|
||||||
|
// FIXME: need to copy args or not?
|
||||||
|
c[longOption] = args
|
||||||
|
delete(c, option)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c CaseCurl) checkOptions() error {
|
||||||
|
for option := range c {
|
||||||
|
if option == originCmdKey || option == targetUrlKey {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
_, ok := curlOptionWhiteMap[option]
|
||||||
|
if !ok {
|
||||||
|
return errors.Errorf("option %v not supported yet. available options: %v", option, curlOptionWhiteList)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c CaseCurl) toTSteps() ([]*hrp.TStep, error) {
|
||||||
|
var tSteps []*hrp.TStep
|
||||||
|
for _, rawUrl := range c[targetUrlKey] {
|
||||||
|
log.Info().
|
||||||
|
Str("url", rawUrl).
|
||||||
|
Msg("convert test steps")
|
||||||
|
|
||||||
|
step := &stepFromCurl{
|
||||||
|
TStep: &hrp.TStep{
|
||||||
|
Request: &hrp.Request{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if err := step.makeRequestName(c); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := step.makeRequestMethod(c); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := step.makeRequestURL(rawUrl); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := step.makeRequestParams(rawUrl); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := step.makeRequestHeaders(c); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := step.makeRequestCookies(c); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := step.makeRequestBody(c); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
tSteps = append(tSteps, step.TStep)
|
||||||
|
}
|
||||||
|
return tSteps, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type stepFromCurl struct {
|
||||||
|
*hrp.TStep
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestName(c CaseCurl) error {
|
||||||
|
s.Name = c.Get(originCmdKey, 0)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestMethod(c CaseCurl) error {
|
||||||
|
// default --get
|
||||||
|
s.Request.Method = http.MethodGet
|
||||||
|
if c.HaveKey("--data") || c.HaveKey("--form") {
|
||||||
|
s.Request.Method = http.MethodPost
|
||||||
|
}
|
||||||
|
if c.HaveKey("--head") {
|
||||||
|
s.Request.Method = http.MethodHead
|
||||||
|
}
|
||||||
|
if c.HaveKey("--request") {
|
||||||
|
s.Request.Method = hrp.HTTPMethod(strings.ToUpper(c.Get("--request", 0)))
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestURL(rawUrl string) error {
|
||||||
|
u, err := url.Parse(rawUrl)
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "parse URL error")
|
||||||
|
}
|
||||||
|
// default protocol consistent with curl (http)
|
||||||
|
if u.Scheme == "" {
|
||||||
|
u.Scheme = "http"
|
||||||
|
}
|
||||||
|
s.Request.URL = fmt.Sprintf("%s://%s", u.Scheme, u.Host+u.Path)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestParams(rawUrl string) error {
|
||||||
|
s.Request.Params = make(map[string]interface{})
|
||||||
|
u, err := url.Parse(rawUrl)
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "parse URL error")
|
||||||
|
}
|
||||||
|
s.Request.Params = make(map[string]interface{})
|
||||||
|
queryValues := u.Query()
|
||||||
|
// query key may correspond to more than one value, get first query key only
|
||||||
|
for k := range queryValues {
|
||||||
|
s.Request.Params[k] = queryValues.Get(k)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestHeaders(c CaseCurl) error {
|
||||||
|
s.Request.Headers = make(map[string]string)
|
||||||
|
headerList := c["--header"]
|
||||||
|
for _, headerExpr := range headerList {
|
||||||
|
if err := s.makeRequestHeader(headerExpr); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestHeader(headerExpr string) error {
|
||||||
|
headerExpr = strings.TrimSpace(headerExpr)
|
||||||
|
if strings.HasPrefix(headerExpr, "@") {
|
||||||
|
return errors.Errorf("loading header from file not supported: %v", headerExpr)
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(headerExpr) == ";" || strings.HasPrefix(strings.TrimSpace(headerExpr), ":") {
|
||||||
|
return errors.Errorf("invalid curl header format: %v", headerExpr)
|
||||||
|
}
|
||||||
|
if s.Request.Headers == nil {
|
||||||
|
s.Request.Headers = make(map[string]string)
|
||||||
|
}
|
||||||
|
if i := strings.Index(headerExpr, ":"); i != -1 {
|
||||||
|
headerKey := strings.TrimSpace(headerExpr[:i])
|
||||||
|
var headerValue string
|
||||||
|
if i < len(headerExpr)-1 {
|
||||||
|
headerValue = strings.TrimSpace(headerExpr[i+1:])
|
||||||
|
}
|
||||||
|
if strings.ToLower(headerKey) == "host" {
|
||||||
|
// headerExpr modifying internal header like "Host:"
|
||||||
|
log.Warn().Str("--header", headerExpr).Msg("modifying internal header not supported")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if headerValue != "" {
|
||||||
|
// normal headerExpr like "User-Agent: httprunner"
|
||||||
|
s.Request.Headers[headerKey] = headerValue
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if i := strings.Index(headerExpr, ";"); i != -1 {
|
||||||
|
// headerExpr terminated with a semicolon like "X-Custom-Header;"
|
||||||
|
headerKey := strings.TrimSpace(headerExpr[:i])
|
||||||
|
if strings.ToLower(headerKey) == "host" {
|
||||||
|
log.Warn().Str("--header", headerExpr).Msg("modifying internal header not supported")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
s.Request.Headers[headerKey] = ""
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
log.Warn().Str("--header", headerExpr).Msg("pass meaningless curl header expression")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestCookies(c CaseCurl) error {
|
||||||
|
s.Request.Cookies = make(map[string]string)
|
||||||
|
cookieList := c["--cookie"]
|
||||||
|
for _, cookieExpr := range cookieList {
|
||||||
|
if err := s.makeRequestCookie(cookieExpr); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestCookie(cookieExpr string) error {
|
||||||
|
if !strings.Contains(cookieExpr, "=") {
|
||||||
|
return errors.Errorf("loading cookie from file not supported: %v", cookieExpr)
|
||||||
|
}
|
||||||
|
if s.Request.Cookies == nil {
|
||||||
|
s.Request.Cookies = make(map[string]string)
|
||||||
|
}
|
||||||
|
// deal with cookieExpr like "name1=value1; name2 = value2"
|
||||||
|
cookies := strings.Split(cookieExpr, ";")
|
||||||
|
for _, cookie := range cookies {
|
||||||
|
i := strings.Index(cookie, "=")
|
||||||
|
if i == -1 {
|
||||||
|
log.Warn().Str("--cookie", cookie).Msg("pass meaningless curl cookie expression")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cookieKey := strings.TrimSpace(cookie[:i])
|
||||||
|
var cookieValue string
|
||||||
|
if i < len(cookie)-1 {
|
||||||
|
cookieValue = strings.TrimSpace(cookie[i+1:])
|
||||||
|
}
|
||||||
|
s.Request.Cookies[cookieKey] = cookieValue
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestBody(c CaseCurl) error {
|
||||||
|
// check priority: --data > --form
|
||||||
|
dataList, dataExisted := c["--data"]
|
||||||
|
formList, formExisted := c["--form"]
|
||||||
|
if dataExisted {
|
||||||
|
if err := s.makeRequestData(dataList); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else if formExisted {
|
||||||
|
if err := s.makeRequestForm(formList); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestData(dataList []string) error {
|
||||||
|
dataMap := make(map[string]interface{})
|
||||||
|
for _, dataExpr := range dataList {
|
||||||
|
if strings.HasPrefix(dataExpr, "@") {
|
||||||
|
return errors.Errorf("loading data from file not supported: %v", dataExpr)
|
||||||
|
}
|
||||||
|
var m map[string]interface{}
|
||||||
|
// --data may be json string, try to unmarshal to map first
|
||||||
|
err := json.Unmarshal([]byte(dataExpr), &m)
|
||||||
|
if err == nil {
|
||||||
|
for k, v := range m {
|
||||||
|
dataMap[k] = v
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dataValues, err := url.ParseQuery(dataExpr)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for dataKey := range dataValues {
|
||||||
|
dataMap[dataKey] = strings.Trim(dataValues.Get(dataKey), "\"'")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s.Request.Body = dataMap
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *stepFromCurl) makeRequestForm(formList []string) error {
|
||||||
|
if s.Request.Upload == nil {
|
||||||
|
s.Request.Upload = make(map[string]interface{})
|
||||||
|
}
|
||||||
|
for _, formExpr := range formList {
|
||||||
|
if !strings.Contains(formExpr, "=") {
|
||||||
|
return errors.Errorf("option --form: is badly used: %v", formExpr)
|
||||||
|
}
|
||||||
|
if i := strings.Index(formExpr, "="); i != -1 {
|
||||||
|
formKey := strings.TrimSpace(formExpr[:i])
|
||||||
|
var formValue string
|
||||||
|
if i < len(formExpr)-1 {
|
||||||
|
formValue = strings.TrimSpace(formExpr[i+1:])
|
||||||
|
}
|
||||||
|
s.Request.Upload[formKey] = strings.Trim(formValue, "\"")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
package convert
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
var curlPath = "../../../examples/data/curl/curl_examples.txt"
|
||||||
|
|
||||||
|
func TestLoadCurlCase(t *testing.T) {
|
||||||
|
tCase, err := LoadCurlCase(curlPath)
|
||||||
|
if !assert.NoError(t, err) {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !assert.Equal(t, 6, len(tCase.TestSteps)) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
|
||||||
|
// curl httpbin.org
|
||||||
|
if !assert.Equal(t, "curl httpbin.org", tCase.TestSteps[0].Name) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
if !assert.EqualValues(t, "GET", tCase.TestSteps[0].Request.Method) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
if !assert.Equal(t, "http://httpbin.org", tCase.TestSteps[0].Request.URL) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
|
||||||
|
// curl https://httpbin.org/get?key1=value1&key2=value2
|
||||||
|
if !assert.Equal(t, "https://httpbin.org/get", tCase.TestSteps[1].Request.URL) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
if !assert.Equal(t, map[string]interface{}{
|
||||||
|
"key1": "value1",
|
||||||
|
"key2": "value2",
|
||||||
|
}, tCase.TestSteps[1].Request.Params) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
|
||||||
|
// curl -H "Content-Type: application/json" \
|
||||||
|
// -H "Authorization: Bearer b7d03a6947b217efb6f3ec3bd3504582" \
|
||||||
|
// -d '{"type":"A","name":"www","data":"162.10.66.0","priority":null,"port":null,"weight":null}' \
|
||||||
|
// "https://httpbin.org/post"
|
||||||
|
if !assert.EqualValues(t, "POST", tCase.TestSteps[2].Request.Method) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
if !assert.Equal(t, map[string]string{
|
||||||
|
"Authorization": "Bearer b7d03a6947b217efb6f3ec3bd3504582",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
}, tCase.TestSteps[2].Request.Headers) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
if !assert.Equal(t, map[string]interface{}{
|
||||||
|
"data": "162.10.66.0",
|
||||||
|
"name": "www",
|
||||||
|
"port": nil,
|
||||||
|
"priority": nil,
|
||||||
|
"type": "A",
|
||||||
|
"weight": nil,
|
||||||
|
}, tCase.TestSteps[2].Request.Body) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
|
||||||
|
// curl -F "dummyName=dummyFile" -F file1=@file1.txt -F file2=@file2.txt https://httpbin.org/post
|
||||||
|
if !assert.Equal(t, map[string]interface{}{
|
||||||
|
"dummyName": "dummyFile",
|
||||||
|
"file1": "@file1.txt",
|
||||||
|
"file2": "@file2.txt",
|
||||||
|
}, tCase.TestSteps[3].Request.Upload) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
|
||||||
|
// curl https://httpbin.org/post \
|
||||||
|
// -d 'shipment[to_address][id]=adr_HrBKVA85' \
|
||||||
|
// -d 'shipment[from_address][id]=adr_VtuTOj7o' \
|
||||||
|
// -d 'shipment[parcel][id]=prcl_WDv2VzHp' \
|
||||||
|
// -d 'shipment[is_return]=true' \
|
||||||
|
// -d 'shipment[customs_info][id]=cstinfo_bl5sE20Y'
|
||||||
|
if !assert.Equal(t, map[string]interface{}{
|
||||||
|
"shipment[customs_info][id]": "cstinfo_bl5sE20Y",
|
||||||
|
"shipment[from_address][id]": "adr_VtuTOj7o",
|
||||||
|
"shipment[is_return]": "true",
|
||||||
|
"shipment[parcel][id]": "prcl_WDv2VzHp",
|
||||||
|
"shipment[to_address][id]": "adr_HrBKVA85",
|
||||||
|
}, tCase.TestSteps[4].Request.Body) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
|
||||||
|
// curl https://httpbing.org/post -H "Content-Type: application/x-www-form-urlencoded" \
|
||||||
|
// --data "key1=value+1&key2=value%3A2"
|
||||||
|
if !assert.Equal(t, map[string]string{
|
||||||
|
"Content-Type": "application/x-www-form-urlencoded",
|
||||||
|
}, tCase.TestSteps[5].Request.Headers) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
if !assert.Equal(t, map[string]interface{}{
|
||||||
|
"key1": "value 1",
|
||||||
|
"key2": "value:2",
|
||||||
|
}, tCase.TestSteps[5].Request.Body) {
|
||||||
|
t.Fatal()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# NOTE: Generated By hrp v4.1.5, DO NOT EDIT!
|
# NOTE: Generated By hrp v4.1.6, DO NOT EDIT!
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
@@ -10,6 +10,7 @@ from debugtalk import *
|
|||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import funppy
|
import funppy
|
||||||
|
|
||||||
funppy.register("get_user_agent", get_user_agent)
|
funppy.register("get_user_agent", get_user_agent)
|
||||||
funppy.register("sleep", sleep)
|
funppy.register("sleep", sleep)
|
||||||
funppy.register("sum", sum)
|
funppy.register("sum", sum)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// NOTE: Generated By hrp v4.1.5, DO NOT EDIT!
|
// NOTE: Generated By hrp v4.1.6, DO NOT EDIT!
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|||||||
+35
-31
@@ -60,11 +60,45 @@ func (path *TestCasePath) ToTestCase() (*TestCase, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
return tc.ToTestCase(casePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TCase represents testcase data structure.
|
||||||
|
// Each testcase includes one public config and several sequential teststeps.
|
||||||
|
type TCase struct {
|
||||||
|
Config *TConfig `json:"config" yaml:"config"`
|
||||||
|
TestSteps []*TStep `json:"teststeps" yaml:"teststeps"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// MakeCompat converts TCase compatible with Golang engine style
|
||||||
|
func (tc *TCase) MakeCompat() (err error) {
|
||||||
|
defer func() {
|
||||||
|
if p := recover(); p != nil {
|
||||||
|
err = fmt.Errorf("[MakeCompat] convert compat testcase error: %v", p)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
for _, step := range tc.TestSteps {
|
||||||
|
// 1. deal with request body compatibility
|
||||||
|
convertCompatRequestBody(step.Request)
|
||||||
|
|
||||||
|
// 2. deal with validators compatibility
|
||||||
|
err = convertCompatValidator(step.Validators)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. deal with extract expr including hyphen
|
||||||
|
convertExtract(step.Extract)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tc *TCase) ToTestCase(casePath string) (*TestCase, error) {
|
||||||
if tc.TestSteps == nil {
|
if tc.TestSteps == nil {
|
||||||
return nil, errors.New("invalid testcase format, missing teststeps!")
|
return nil, errors.New("invalid testcase format, missing teststeps!")
|
||||||
}
|
}
|
||||||
|
|
||||||
err = tc.MakeCompat()
|
err := tc.MakeCompat()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -173,36 +207,6 @@ func (path *TestCasePath) ToTestCase() (*TestCase, error) {
|
|||||||
return testCase, nil
|
return testCase, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// TCase represents testcase data structure.
|
|
||||||
// Each testcase includes one public config and several sequential teststeps.
|
|
||||||
type TCase struct {
|
|
||||||
Config *TConfig `json:"config" yaml:"config"`
|
|
||||||
TestSteps []*TStep `json:"teststeps" yaml:"teststeps"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// MakeCompat converts TCase compatible with Golang engine style
|
|
||||||
func (tc *TCase) MakeCompat() (err error) {
|
|
||||||
defer func() {
|
|
||||||
if p := recover(); p != nil {
|
|
||||||
err = fmt.Errorf("[MakeCompat] convert compat testcase error: %v", p)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
for _, step := range tc.TestSteps {
|
|
||||||
// 1. deal with request body compatibility
|
|
||||||
convertCompatRequestBody(step.Request)
|
|
||||||
|
|
||||||
// 2. deal with validators compatibility
|
|
||||||
err = convertCompatValidator(step.Validators)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. deal with extract expr including hyphen
|
|
||||||
convertExtract(step.Extract)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func convertCompatRequestBody(request *Request) {
|
func convertCompatRequestBody(request *Request) {
|
||||||
if request != nil && request.Body == nil {
|
if request != nil && request.Body == nil {
|
||||||
if request.Json != nil {
|
if request.Json != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user