diff --git a/frappe/__init__.py b/frappe/__init__.py index 4cbd57e19c..ad54ec91a6 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -87,7 +87,18 @@ def init(site, sites_path=None): local.error_log = [] local.message_log = [] local.debug_log = [] - local.flags = _dict({}) + local.flags = _dict({ + "ran_schedulers": [], + "redirect_location": "", + "in_install_db": False, + "in_install_app": False, + "in_import": False, + "in_test": False, + "mute_messages": False, + "ignore_links": False, + "mute_emails": False, + "has_dataurl": False, + }) local.rollback_observers = [] local.test_objects = {} diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 0db67aff7c..3b94a6a94d 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -11,11 +11,10 @@ import json class TestScheduler(TestCase): def setUp(self): - frappe.flags.ran_schedulers = [] frappe.db.set_global('enabled_scheduler_events', "") def test_all_events(self): - last = get_datetime(frappe.db.get_global('scheduler_last_event')) + last = now_datetime() - relativedelta(hours=2) enqueue_applicable_events(frappe.local.site, now_datetime(), last) self.assertTrue("all" in frappe.flags.ran_schedulers) @@ -40,3 +39,7 @@ class TestScheduler(TestCase): enqueue_applicable_events(frappe.local.site, now_datetime(), last) self.assertTrue("all" in frappe.flags.ran_schedulers) self.assertTrue("hourly" in frappe.flags.ran_schedulers) + + def tearDown(self): + frappe.flags.ran_schedulers = [] +