yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-04-21 04:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: server test

Browse Source
This commit is contained in:
bigeagle 2016-04-28 23:12:10 +08:00
parent 292a24ba20
commit ad2b65fcaa
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manager/server.go
View File

@ -195,15 +195,7 @@ func (s *Manager) updateJobOfWorker(c *gin.Context) {
c.BindJSON(&status)
mirrorName := status.Name
curStatus, err := s.adapter.GetMirrorStatus(workerID, mirrorName)
if err != nil {
err := fmt.Errorf("failed to get job %s of worker %s: %s",
mirrorName, workerID, err.Error(),
)
c.Error(err)
s.returnErrJSON(c, http.StatusInternalServerError, err)
return
}
curStatus, _ := s.adapter.GetMirrorStatus(workerID, mirrorName)
// Only successful syncing needs last_update
if status.Status == Success {

50
manager/server_test.go
View File

@ -82,13 +82,12 @@ func TestHTTPServer(t *testing.T) {
Convey("update mirror status of a existed worker", func(ctx C) {
status := MirrorStatus{
Name: "arch-sync1",
Worker: "test_worker1",
IsMaster: true,
Status: Success,
LastUpdate: time.Now(),
Upstream: "mirrors.tuna.tsinghua.edu.cn",
Size: "3GB",
Name: "arch-sync1",
Worker: "test_worker1",
IsMaster: true,
Status: Success,
Upstream: "mirrors.tuna.tsinghua.edu.cn",
Size: "3GB",
}
resp, err := PostJSON(fmt.Sprintf("%s/workers/%s/jobs/%s", baseURL, status.Worker, status.Name), status, nil)
defer resp.Body.Close()
@ -96,31 +95,36 @@ func TestHTTPServer(t *testing.T) {
So(resp.StatusCode, ShouldEqual, http.StatusOK)
Convey("list mirror status of an existed worker", func(ctx C) {
var ms []MirrorStatus
resp, err := GetJSON(baseURL+"/workers/test_worker1/jobs", &ms, nil)
expectedResponse, err := json.Marshal([]MirrorStatus{status})
So(err, ShouldBeNil)
resp, err := http.Get(baseURL + "/workers/test_worker1/jobs")
So(err, ShouldBeNil)
So(resp.StatusCode, ShouldEqual, http.StatusOK)
// err = json.NewDecoder(resp.Body).Decode(&mirrorStatusList)
body, err := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
So(err, ShouldBeNil)
So(strings.TrimSpace(string(body)), ShouldEqual, string(expectedResponse))
m := ms[0]
So(m.Name, ShouldEqual, status.Name)
So(m.Worker, ShouldEqual, status.Worker)
So(m.Status, ShouldEqual, status.Status)
So(m.Upstream, ShouldEqual, status.Upstream)
So(m.Size, ShouldEqual, status.Size)
So(m.IsMaster, ShouldEqual, status.IsMaster)
So(time.Now().Sub(m.LastUpdate), ShouldBeLessThan, 1*time.Second)
})
Convey("list all job status of all workers", func(ctx C) {
expectedResponse, err := json.Marshal(
[]webMirrorStatus{convertMirrorStatus(status)},
)
So(err, ShouldBeNil)
resp, err := http.Get(baseURL + "/jobs")
var ms []webMirrorStatus
resp, err := GetJSON(baseURL+"/jobs", &ms, nil)
So(err, ShouldBeNil)
So(resp.StatusCode, ShouldEqual, http.StatusOK)
body, err := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
So(err, ShouldBeNil)
So(strings.TrimSpace(string(body)), ShouldEqual, string(expectedResponse))
m := ms[0]
So(m.Name, ShouldEqual, status.Name)
So(m.Status, ShouldEqual, status.Status)
So(m.Upstream, ShouldEqual, status.Upstream)
So(m.Size, ShouldEqual, status.Size)
So(m.IsMaster, ShouldEqual, status.IsMaster)
So(time.Now().Sub(m.LastUpdate.Time), ShouldBeLessThan, 1*time.Second)
})
})