mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Cleanup jobs manager test
This commit is contained in:
parent
698eef053a
commit
f18c258231
@ -235,6 +235,9 @@ class LoopTest(BaseTest):
|
|||||||
self.append(' '.join(args))
|
self.append(' '.join(args))
|
||||||
s = ('waiting', 'running')
|
s = ('waiting', 'running')
|
||||||
jm = JobsManager(O(1, 5), FakeLog())
|
jm = JobsManager(O(1, 5), FakeLog())
|
||||||
|
def job_status(jid):
|
||||||
|
return jm.job_status(jid)[0]
|
||||||
|
|
||||||
# Start jobs
|
# Start jobs
|
||||||
job_id1 = jm.start_job('simple test', 'calibre.srv.jobs', 'sleep_test', args=(1.0,))
|
job_id1 = jm.start_job('simple test', 'calibre.srv.jobs', 'sleep_test', args=(1.0,))
|
||||||
job_id2 = jm.start_job('t2', 'calibre.srv.jobs', 'sleep_test', args=(3,))
|
job_id2 = jm.start_job('t2', 'calibre.srv.jobs', 'sleep_test', args=(3,))
|
||||||
@ -244,9 +247,9 @@ class LoopTest(BaseTest):
|
|||||||
job_id = job_id1
|
job_id = job_id1
|
||||||
status = jm.job_status(job_id)[0]
|
status = jm.job_status(job_id)[0]
|
||||||
self.assertIn(status, s)
|
self.assertIn(status, s)
|
||||||
status2 = jm.job_status(job_id2)[0]
|
for jid in (job_id2, job_id3):
|
||||||
self.assertEqual(status2, 'waiting')
|
self.assertEqual(job_status(jid), 'waiting')
|
||||||
while jm.job_status(job_id)[0] in s:
|
while job_status(job_id) in s:
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
status, result, tb, was_aborted = jm.job_status(job_id)
|
status, result, tb, was_aborted = jm.job_status(job_id)
|
||||||
self.assertEqual(status, 'finished')
|
self.assertEqual(status, 'finished')
|
||||||
@ -256,18 +259,18 @@ class LoopTest(BaseTest):
|
|||||||
|
|
||||||
# Job 2
|
# Job 2
|
||||||
job_id = job_id2
|
job_id = job_id2
|
||||||
while jm.job_status(job_id)[0] == 'waiting':
|
while job_status(job_id) == 'waiting':
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
status2 = jm.job_status(job_id)[0]
|
self.assertEqual('running', job_status(job_id))
|
||||||
self.assertEqual(status2, 'running')
|
|
||||||
jm.abort_job(job_id)
|
jm.abort_job(job_id)
|
||||||
self.assertTrue(jm.wait_for_running_job(job_id))
|
self.assertIn(jm.wait_for_running_job(job_id), (True, None))
|
||||||
status, result, tb, was_aborted = jm.job_status(job_id)
|
status, result, tb, was_aborted = jm.job_status(job_id)
|
||||||
|
self.assertEqual('finished', status)
|
||||||
self.assertTrue(was_aborted)
|
self.assertTrue(was_aborted)
|
||||||
|
|
||||||
# Job 3
|
# Job 3
|
||||||
job_id = job_id3
|
job_id = job_id3
|
||||||
while jm.job_status(job_id)[0] == 'waiting':
|
while job_status(job_id) == 'waiting':
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
self.assertIn(jm.wait_for_running_job(job_id), (True, None))
|
self.assertIn(jm.wait_for_running_job(job_id), (True, None))
|
||||||
status, result, tb, was_aborted = jm.job_status(job_id)
|
status, result, tb, was_aborted = jm.job_status(job_id)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user