yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-06-14 13:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix possible null dereferencing in server_test

Browse Source
This commit is contained in:
zyx 2019-04-13 11:09:11 +08:00
parent 9f91d90fc5
commit 1025189542
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manager/server_test.go
View File

@ -132,8 +132,8 @@ func TestHTTPServer(t *testing.T) {
Size: "unknown", Size: "unknown",
} }
resp, err := PostJSON(fmt.Sprintf("%s/workers/%s/jobs/%s", baseURL, status.Worker, status.Name), status, nil) resp, err := PostJSON(fmt.Sprintf("%s/workers/%s/jobs/%s", baseURL, status.Worker, status.Name), status, nil)
defer resp.Body.Close()
So(err, ShouldBeNil) So(err, ShouldBeNil)
defer resp.Body.Close()
So(resp.StatusCode, ShouldEqual, http.StatusOK) So(resp.StatusCode, ShouldEqual, http.StatusOK)
Convey("list mirror status of an existed worker", func(ctx C) { Convey("list mirror status of an existed worker", func(ctx C) {
@ -232,8 +232,8 @@ func TestHTTPServer(t *testing.T) {
status.Status = Failed status.Status = Failed
time.Sleep(3 * time.Second) time.Sleep(3 * time.Second)
resp, err = PostJSON(fmt.Sprintf("%s/workers/%s/jobs/%s", baseURL, status.Worker, status.Name), status, nil) resp, err = PostJSON(fmt.Sprintf("%s/workers/%s/jobs/%s", baseURL, status.Worker, status.Name), status, nil)
defer resp.Body.Close()
So(err, ShouldBeNil) So(err, ShouldBeNil)
defer resp.Body.Close()
So(resp.StatusCode, ShouldEqual, http.StatusOK) So(resp.StatusCode, ShouldEqual, http.StatusOK)
Convey("What if syncing job failed", func(ctx C) { Convey("What if syncing job failed", func(ctx C) {
@ -313,11 +313,11 @@ func TestHTTPServer(t *testing.T) {
// run the mock worker server // run the mock worker server
workerServer.Run(bindAddress) workerServer.Run(bindAddress)
}() }()
time.Sleep(50 * time.Microsecond) time.Sleep(50 * time.Millisecond)
// verify the worker mock server is running // verify the worker mock server is running
workerResp, err := http.Get(workerBaseURL + "/ping") workerResp, err := http.Get(workerBaseURL + "/ping")
defer workerResp.Body.Close()
So(err, ShouldBeNil) So(err, ShouldBeNil)
defer workerResp.Body.Close()
So(workerResp.StatusCode, ShouldEqual, http.StatusOK) So(workerResp.StatusCode, ShouldEqual, http.StatusOK)
Convey("when client send wrong cmd", func(ctx C) { Convey("when client send wrong cmd", func(ctx C) {
@ -327,8 +327,8 @@ func TestHTTPServer(t *testing.T) {
WorkerID: "not_exist_worker", WorkerID: "not_exist_worker",
} }
resp, err := PostJSON(baseURL+"/cmd", clientCmd, nil) resp, err := PostJSON(baseURL+"/cmd", clientCmd, nil)
defer resp.Body.Close()
So(err, ShouldBeNil) So(err, ShouldBeNil)
defer resp.Body.Close()
So(resp.StatusCode, ShouldEqual, http.StatusBadRequest) So(resp.StatusCode, ShouldEqual, http.StatusBadRequest)
}) })
@ -340,9 +340,8 @@ func TestHTTPServer(t *testing.T) {
} }
resp, err := PostJSON(baseURL+"/cmd", clientCmd, nil) resp, err := PostJSON(baseURL+"/cmd", clientCmd, nil)
defer resp.Body.Close()
So(err, ShouldBeNil) So(err, ShouldBeNil)
defer resp.Body.Close()
So(resp.StatusCode, ShouldEqual, http.StatusOK) So(resp.StatusCode, ShouldEqual, http.StatusOK)
time.Sleep(50 * time.Microsecond) time.Sleep(50 * time.Microsecond)
select { select {