From 4755f416db993c613bd3a2fc824ab382bb4c119a Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 29 Oct 2021 15:10:57 +0530 Subject: [PATCH] test: restore scheduler state after running tests --- frappe/test_runner.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index fa3ef7986e..5f26842be2 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -60,7 +60,10 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), # workaround! since there is no separate test db frappe.clear_cache() - frappe.utils.scheduler.disable_scheduler() + scheduler_disabled_by_user = frappe.utils.scheduler.is_scheduler_disabled() + if not scheduler_disabled_by_user: + frappe.utils.scheduler.disable_scheduler() + set_test_email_config() frappe.conf.update({'bench_id': 'test_bench', 'use_rq_auth': False}) @@ -77,7 +80,9 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), else: ret = run_all_tests(app, verbose, profile, ui_tests, failfast=failfast, junit_xml_output=junit_xml_output) - frappe.utils.scheduler.enable_scheduler() + if not scheduler_disabled_by_user: + frappe.utils.scheduler.enable_scheduler() + if frappe.db: frappe.db.commit() # workaround! since there is no separate test db