Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11004 from steven-zou/fix/update_js_ut_case

Browse Source 
fix[js_ut]:update stop job case of js
This commit is contained in:
Steven Zou 2020-03-19 15:49:08 +08:00 committed by GitHub
commit e8d5ba9491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,26 +188,24 @@ func (suite *CWorkerTestSuite) TestStopJob() {
genericJob, err := suite.cWorker.Enqueue("fake_long_run_job", params, false, "")
require.NoError(suite.T(), err, "enqueue job: nil error expected but got %s", err)
t, err := suite.lcmCtl.New(genericJob)
_, err = suite.lcmCtl.New(genericJob)
require.NoError(suite.T(), err, "new job stats: nil error expected but got %s", err)
tk := time.NewTicker(417 * time.Millisecond)
defer tk.Stop()
/*
// Check if the job is running
times := 20
sleep := 500 * time.Millisecond
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
for times > 0 {
st, err := t.Status()
require.NoError(suite.T(), err, "retrieve enqueued job status")
if st.Compare(job.RunningStatus) >= 0 {
break
}
case <-time.After(29 * time.Second):
require.NoError(suite.T(), errors.New("check running status time out"))
return
}
}
times--
time.Sleep(sleep)
}*/
err = suite.cWorker.StopJob(genericJob.Info.JobID)
require.NoError(suite.T(), err, "stop job: nil error expected but got %s", err)
@ -215,7 +213,7 @@ LOOP:
// Stop scheduled job
scheduledJob, err := suite.cWorker.Schedule("fake_long_run_job", params, 120, false, "")
require.NoError(suite.T(), err, "schedule job: nil error expected but got %s", err)
t, err = suite.lcmCtl.New(scheduledJob)
_, err = suite.lcmCtl.New(scheduledJob)
require.NoError(suite.T(), err, "new job stats: nil error expected but got %s", err)
err = suite.cWorker.StopJob(scheduledJob.Info.JobID)