server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4648 from Loyalsoldier/httplib-fix-lint

Browse Source 
Fix lint and format code in adapter/httplib dir
This commit is contained in:
Ming Deng 2021-06-06 16:22:18 +08:00 committed by GitHub
commit bd134b94db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
- Add: Convenient way to generate mock object [4620](https://github.com/beego/beego/issues/4620) - Add: Convenient way to generate mock object [4620](https://github.com/beego/beego/issues/4620)
- Infra: use dependabot to update dependencies. [4623](https://github.com/beego/beego/pull/4623) - Infra: use dependabot to update dependencies. [4623](https://github.com/beego/beego/pull/4623)
- Lint: use golangci-lint. [4619](https://github.com/beego/beego/pull/4619) - Lint: use golangci-lint. [4619](https://github.com/beego/beego/pull/4619)
- Fix lint and format code in adapter/httplib dir [4648](https://github.com/beego/beego/pull/4648)
- Chore: format code. [4615](https://github.com/beego/beego/pull/4615) - Chore: format code. [4615](https://github.com/beego/beego/pull/4615)
- Test on Go v1.15.x & v1.16.x. [4614](https://github.com/beego/beego/pull/4614) - Test on Go v1.15.x & v1.16.x. [4614](https://github.com/beego/beego/pull/4614)
- Env: non-empty GOBIN & GOPATH. [4613](https://github.com/beego/beego/pull/4613) - Env: non-empty GOBIN & GOPATH. [4613](https://github.com/beego/beego/pull/4613)

22
adapter/httplib/httplib_test.go
View File

@ -26,11 +26,13 @@ import (
"time" "time"
) )
const getUrl = "http://httpbin.org/get" const (
const ipUrl = "http://httpbin.org/ip" getURL = "http://httpbin.org/get"
ipURL = "http://httpbin.org/ip"
)
func TestResponse(t *testing.T) { func TestResponse(t *testing.T) {
req := Get(getUrl) req := Get(getURL)
resp, err := req.Response() resp, err := req.Response()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -63,12 +65,10 @@ func TestDoRequest(t *testing.T) {
if elapsedTime < delayedTime { if elapsedTime < delayedTime {
t.Errorf("Not enough retries. Took %dms. Delay was meant to take %dms", elapsedTime, delayedTime) t.Errorf("Not enough retries. Took %dms. Delay was meant to take %dms", elapsedTime, delayedTime)
} }
} }
func TestGet(t *testing.T) { func TestGet(t *testing.T) {
req := Get(getURL)
req := Get(getUrl)
b, err := req.Bytes() b, err := req.Bytes()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -210,7 +210,7 @@ func TestWithSetting(t *testing.T) {
setting.ReadWriteTimeout = 5 * time.Second setting.ReadWriteTimeout = 5 * time.Second
SetDefaultSetting(setting) SetDefaultSetting(setting)
str, err := Get(getUrl).String() str, err := Get(getURL).String()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -223,8 +223,7 @@ func TestWithSetting(t *testing.T) {
} }
func TestToJson(t *testing.T) { func TestToJson(t *testing.T) {
req := Get(ipURL)
req := Get(ipUrl)
resp, err := req.Response() resp, err := req.Response()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -250,12 +249,11 @@ func TestToJson(t *testing.T) {
t.Fatal("response is not valid ip") t.Fatal("response is not valid ip")
} }
} }
} }
func TestToFile(t *testing.T) { func TestToFile(t *testing.T) {
f := "beego_testfile" f := "beego_testfile"
req := Get(ipUrl) req := Get(ipURL)
err := req.ToFile(f) err := req.ToFile(f)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -269,7 +267,7 @@ func TestToFile(t *testing.T) {
func TestToFileDir(t *testing.T) { func TestToFileDir(t *testing.T) {
f := "./files/beego_testfile" f := "./files/beego_testfile"
req := Get(ipUrl) req := Get(ipURL)
err := req.ToFile(f) err := req.ToFile(f)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)