Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8049 from steven-zou/fix_js_ut_cases 

fix failure UT case of job service
This commit is contained in:
Steven Zou 2019-06-21 14:55:50 +08:00 committed by GitHub
parent 0798e0d795 b9f45cd30a
commit 7c86c98687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/jobservice/worker/cworker/c_worker_test.go
View File

@ -188,11 +188,23 @@ func (suite *CWorkerTestSuite) TestStopJob() {
t, err := suite.lcmCtl.New(genericJob)
require.NoError(suite.T(), err, "new job stats: nil error expected but got %s", err)
time.Sleep(3 * time.Second)
tk := time.NewTicker(500 * time.Millisecond)
defer tk.Stop()
latest, err := t.Status()
require.NoError(suite.T(), err, "get latest status: nil error expected but got %s", err)
assert.EqualValues(suite.T(), job.RunningStatus, latest, "expect job is running now")
LOOP:
for {
select {
case <-tk.C:
latest, err := t.Status()
require.NoError(suite.T(), err, "get latest status: nil error expected but got %s", err)
if latest.Compare(job.RunningStatus) == 0 {
break LOOP
}
case <-time.After(30 * time.Second):
require.NoError(suite.T(), errors.New("check running status time out"))
break LOOP
}
}
err = suite.cWorker.StopJob(genericJob.Info.JobID)
require.NoError(suite.T(), err, "stop job: nil error expected but got %s", err)
@ -255,7 +267,7 @@ func (j *fakeLongRunJob) Validate(params job.Parameters) error {
}
func (j *fakeLongRunJob) Run(ctx job.Context, params job.Parameters) error {
time.Sleep(5 * time.Second)
time.Sleep(3 * time.Second)
if _, stopped := ctx.OPCommand(); stopped {
return nil