From 768ca3106c7ebf1de7f1cff13d385b1d1eb3b348 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 23 Jun 2016 06:13:53 +0530 Subject: [PATCH] Make the jobs manager test more robust --- src/calibre/srv/tests/loop.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py index b315d9f6e2..de13ad2940 100644 --- a/src/calibre/srv/tests/loop.py +++ b/src/calibre/srv/tests/loop.py @@ -256,8 +256,11 @@ class LoopTest(BaseTest): self.assertTrue(jm.wait_for_running_job(job_id2)) status, result, tb, was_aborted = jm.job_status(job_id2) self.assertTrue(was_aborted) - self.assertTrue(jm.wait_for_running_job(jid)) + while jm.job_status(job_id)[0] == 'waiting': + time.sleep(0.01) + self.assertIn(jm.wait_for_running_job(jid), (True, None)) status, result, tb, was_aborted = jm.job_status(jid) + self.assertFalse(was_aborted) self.assertTrue(tb), self.assertIn('a testing error', tb) jm.start_job('simple test', 'calibre.srv.jobs', 'sleep_test', args=(1.0,)) jm.shutdown(), jm.wait_for_shutdown(monotonic() + 1)