upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 09:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simple code and typo fixed.

Browse Source 
Signed-off-by: Ri Xu <xuri.me@gmail.com>
This commit is contained in:
Ri Xu 2017-12-23 20:55:07 +08:00
parent 7c510fa2c8
commit 9adccd3723
No known key found for this signature in database
GPG Key ID: BA5E5BB1C948EDF7
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/dao/dao_test.go
View File

@ -1112,7 +1112,7 @@ func TestAddRepJob(t *testing.T) {
func TestUpdateRepJobStatus(t *testing.T) { func TestUpdateRepJobStatus(t *testing.T) {
err := UpdateRepJobStatus(jobID, models.JobFinished) err := UpdateRepJobStatus(jobID, models.JobFinished)
if err != nil { if err != nil {
t.Errorf("Error occured in UpdateRepJobStatus, error: %v, id: %d", err, jobID) t.Errorf("Error occurred in UpdateRepJobStatus, error: %v, id: %d", err, jobID)
return return
} }
j, err := GetRepJob(jobID) j, err := GetRepJob(jobID)
@ -1127,7 +1127,7 @@ func TestUpdateRepJobStatus(t *testing.T) {
} }
err = UpdateRepJobStatus(jobID, models.JobPending) err = UpdateRepJobStatus(jobID, models.JobPending)
if err != nil { if err != nil {
t.Errorf("Error occured in UpdateRepJobStatus when update it back to status pending, error: %v, id: %d", err, jobID) t.Errorf("Error occurred in UpdateRepJobStatus when update it back to status pending, error: %v, id: %d", err, jobID)
return return
} }
} }
@ -1135,7 +1135,7 @@ func TestUpdateRepJobStatus(t *testing.T) {
func TestGetRepPolicyByProject(t *testing.T) { func TestGetRepPolicyByProject(t *testing.T) {
p1, err := GetRepPolicyByProject(99) p1, err := GetRepPolicyByProject(99)
if err != nil { if err != nil {
t.Errorf("Error occured in GetRepPolicyByProject:%v, project ID: %d", err, 99) t.Errorf("Error occurred in GetRepPolicyByProject:%v, project ID: %d", err, 99)
return return
} }
if len(p1) > 0 { if len(p1) > 0 {
@ -1161,7 +1161,7 @@ func TestGetRepPolicyByProject(t *testing.T) {
func TestGetRepJobByPolicy(t *testing.T) { func TestGetRepJobByPolicy(t *testing.T) {
jobs, err := GetRepJobByPolicy(999) jobs, err := GetRepJobByPolicy(999)
if err != nil { if err != nil {
t.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, 999) t.Errorf("Error occurred in GetRepJobByPolicy: %v, policy ID: %d", err, 999)
return return
} }
if len(jobs) > 0 { if len(jobs) > 0 {
@ -1170,7 +1170,7 @@ func TestGetRepJobByPolicy(t *testing.T) {
} }
jobs, err = GetRepJobByPolicy(policyID) jobs, err = GetRepJobByPolicy(policyID)
if err != nil { if err != nil {
t.Errorf("Error occured in GetRepJobByPolicy: %v, policy ID: %d", err, policyID) t.Errorf("Error occurred in GetRepJobByPolicy: %v, policy ID: %d", err, policyID)
return return
} }
if len(jobs) != 1 { if len(jobs) != 1 {
@ -1186,7 +1186,7 @@ func TestGetRepJobByPolicy(t *testing.T) {
func TestFilterRepJobs(t *testing.T) { func TestFilterRepJobs(t *testing.T) {
jobs, _, err := FilterRepJobs(policyID, "", "", nil, nil, 1000, 0) jobs, _, err := FilterRepJobs(policyID, "", "", nil, nil, 1000, 0)
if err != nil { if err != nil {
t.Errorf("Error occured in FilterRepJobs: %v, policy ID: %d", err, policyID) t.Errorf("Error occurred in FilterRepJobs: %v, policy ID: %d", err, policyID)
return return
} }
if len(jobs) != 1 { if len(jobs) != 1 {
@ -1202,13 +1202,13 @@ func TestFilterRepJobs(t *testing.T) {
func TestDeleteRepJob(t *testing.T) { func TestDeleteRepJob(t *testing.T) {
err := DeleteRepJob(jobID) err := DeleteRepJob(jobID)
if err != nil { if err != nil {
t.Errorf("Error occured in DeleteRepJob: %v, id: %d", err, jobID) t.Errorf("Error occurred in DeleteRepJob: %v, id: %d", err, jobID)
return return
} }
t.Logf("deleted rep job, id: %d", jobID) t.Logf("deleted rep job, id: %d", jobID)
j, err := GetRepJob(jobID) j, err := GetRepJob(jobID)
if err != nil { if err != nil {
t.Errorf("Error occured in GetRepJob:%v", err) t.Errorf("Error occurred in GetRepJob:%v", err)
return return
} }
if j != nil { if j != nil {
@ -1271,7 +1271,7 @@ func TestGetRepoJobToStop(t *testing.T) {
func TestDeleteRepTarget(t *testing.T) { func TestDeleteRepTarget(t *testing.T) {
err := DeleteRepTarget(targetID) err := DeleteRepTarget(targetID)
if err != nil { if err != nil {
t.Errorf("Error occured in DeleteRepTarget: %v, id: %d", err, targetID) t.Errorf("Error occurred in DeleteRepTarget: %v, id: %d", err, targetID)
return return
} }
t.Logf("deleted target, id: %d", targetID) t.Logf("deleted target, id: %d", targetID)
@ -1304,13 +1304,13 @@ func TestUpdateRepPolicy(t *testing.T) {
func TestDeleteRepPolicy(t *testing.T) { func TestDeleteRepPolicy(t *testing.T) {
err := DeleteRepPolicy(policyID) err := DeleteRepPolicy(policyID)
if err != nil { if err != nil {
t.Errorf("Error occured in DeleteRepPolicy: %v, id: %d", err, policyID) t.Errorf("Error occurred in DeleteRepPolicy: %v, id: %d", err, policyID)
return return
} }
t.Logf("delete rep policy, id: %d", policyID) t.Logf("delete rep policy, id: %d", policyID)
p, err := GetRepPolicy(policyID) p, err := GetRepPolicy(policyID)
if err != nil && err != orm.ErrNoRows { if err != nil && err != orm.ErrNoRows {
t.Errorf("Error occured in GetRepPolicy:%v", err) t.Errorf("Error occurred in GetRepPolicy:%v", err)
} }
if p != nil && p.Deleted != 1 { if p != nil && p.Deleted != 1 {
t.Errorf("Able to find rep policy after deletion, id: %d", policyID) t.Errorf("Able to find rep policy after deletion, id: %d", policyID)

2
src/common/dao/scan_job.go
View File

@ -167,7 +167,7 @@ func UpdateImgScanOverview(digest, detailsKey string, sev models.Severity, compO
return nil return nil
} }
// ListImgScanOverviews list all records in table img_scan_overview, it is called in notificaiton handler when it needs to refresh the severity of all images. // ListImgScanOverviews list all records in table img_scan_overview, it is called in notification handler when it needs to refresh the severity of all images.
func ListImgScanOverviews() ([]*models.ImgScanOverview, error) { func ListImgScanOverviews() ([]*models.ImgScanOverview, error) {
var res []*models.ImgScanOverview var res []*models.ImgScanOverview
o := GetOrmer() o := GetOrmer()

4
src/common/notifier/notifier.go
View File

@ -31,7 +31,7 @@ type HandlerChannel struct {
//To indicate how many handler instances bound with this chan. //To indicate how many handler instances bound with this chan.
boundCount uint32 boundCount uint32
//The chan for controling concurrent executions. //The chan for controlling concurrent executions.
channel chan bool channel chan bool
} }
@ -199,7 +199,7 @@ func (nw *NotificationWatcher) Notify(notification Notification) error {
}() }()
if err := hd.Handle(notification.Value); err != nil { if err := hd.Handle(notification.Value); err != nil {
//Currently, we just log the error //Currently, we just log the error
log.Errorf("Error occurred when triggerring handler %s of topic %s: %s\n", reflect.TypeOf(hd).String(), notification.Topic, err.Error()) log.Errorf("Error occurred when triggering handler %s of topic %s: %s\n", reflect.TypeOf(hd).String(), notification.Topic, err.Error())
} else { } else {
log.Infof("Handle notification with topic '%s': %#v\n", notification.Topic, notification.Value) log.Infof("Handle notification with topic '%s': %#v\n", notification.Topic, notification.Value)
} }

2
src/common/scheduler/policy/alternate_policy.go
View File

@ -77,7 +77,7 @@ func (alp *AlternatePolicy) Done() <-chan bool {
//AttachTasks is an implementation of same method in policy interface. //AttachTasks is an implementation of same method in policy interface.
func (alp *AlternatePolicy) AttachTasks(tasks ...task.Task) error { func (alp *AlternatePolicy) AttachTasks(tasks ...task.Task) error {
if tasks == nil || len(tasks) == 0 { if len(tasks) == 0 {
return errors.New("No tasks can be attached") return errors.New("No tasks can be attached")
} }