Merge branch 'master' into issue741-break-up-job-management

Author: soxofaan

tests/extra/job_management/test_job_management.py

@@ -275,7 +275,8 @@ def test_start_job_thread_basic(self, tmp_path, job_manager, job_manager_root_di
 
         job_manager.start_job_thread(start_job=self._create_year_job, job_db=job_db)
         # Trigger context switch to job thread
-        sleep(1)
+        # TODO: better way than sleeping to make sure the job thread does all its work?
+        sleep(2)
         job_manager.stop_job_thread()
         # TODO #645 how to collect stats with the threaded run_job?
         assert sleep_mock.call_count > 10