Merge "Update to using oslo periodic tasks implementation."
This commit is contained in:
@@ -1,182 +0,0 @@
|
|||||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
||||||
|
|
||||||
# Copyright 2012 OpenStack Foundation
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
import datetime
|
|
||||||
|
|
||||||
from testtools import matchers
|
|
||||||
|
|
||||||
from nova import manager
|
|
||||||
from nova.openstack.common import timeutils
|
|
||||||
from nova import test
|
|
||||||
|
|
||||||
|
|
||||||
class ManagerMetaTestCase(test.TestCase):
|
|
||||||
"""Tests for the meta class which manages the creation of periodic tasks.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def test_meta(self):
|
|
||||||
class Manager(object):
|
|
||||||
__metaclass__ = manager.ManagerMeta
|
|
||||||
|
|
||||||
@manager.periodic_task
|
|
||||||
def foo(self):
|
|
||||||
return 'foo'
|
|
||||||
|
|
||||||
@manager.periodic_task(spacing=4)
|
|
||||||
def bar(self):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
@manager.periodic_task(enabled=False)
|
|
||||||
def baz(self):
|
|
||||||
return 'baz'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
self.assertThat(m._periodic_tasks, matchers.HasLength(2))
|
|
||||||
self.assertEqual(None, m._periodic_spacing['foo'])
|
|
||||||
self.assertEqual(4, m._periodic_spacing['bar'])
|
|
||||||
self.assertThat(
|
|
||||||
m._periodic_spacing, matchers.Not(matchers.Contains('baz')))
|
|
||||||
|
|
||||||
|
|
||||||
class Manager(test.TestCase):
|
|
||||||
"""Tests the periodic tasks portion of the manager class."""
|
|
||||||
|
|
||||||
def test_periodic_tasks_with_idle(self):
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=200)
|
|
||||||
def bar(self):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
self.assertThat(m._periodic_tasks, matchers.HasLength(1))
|
|
||||||
self.assertEqual(200, m._periodic_spacing['bar'])
|
|
||||||
|
|
||||||
# Now a single pass of the periodic tasks
|
|
||||||
idle = m.periodic_tasks(None)
|
|
||||||
self.assertAlmostEqual(60, idle, 1)
|
|
||||||
|
|
||||||
def test_periodic_tasks_constant(self):
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=0)
|
|
||||||
def bar(self):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
idle = m.periodic_tasks(None)
|
|
||||||
self.assertAlmostEqual(60, idle, 1)
|
|
||||||
|
|
||||||
def test_periodic_tasks_idle_calculation(self):
|
|
||||||
fake_time = datetime.datetime(3000, 1, 1)
|
|
||||||
timeutils.set_time_override(fake_time)
|
|
||||||
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=10)
|
|
||||||
def bar(self, context):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
|
|
||||||
# Ensure initial values are correct
|
|
||||||
self.assertEqual(1, len(m._periodic_tasks))
|
|
||||||
task_name, task = m._periodic_tasks[0]
|
|
||||||
|
|
||||||
# Test task values
|
|
||||||
self.assertEqual('bar', task_name)
|
|
||||||
self.assertEqual(10, task._periodic_spacing)
|
|
||||||
self.assertEqual(True, task._periodic_enabled)
|
|
||||||
self.assertEqual(False, task._periodic_external_ok)
|
|
||||||
self.assertEqual(False, task._periodic_immediate)
|
|
||||||
self.assertNotEqual(None, task._periodic_last_run)
|
|
||||||
|
|
||||||
# Test the manager's representation of those values
|
|
||||||
self.assertEqual(10, m._periodic_spacing[task_name])
|
|
||||||
self.assertNotEqual(None, m._periodic_last_run[task_name])
|
|
||||||
|
|
||||||
timeutils.advance_time_delta(datetime.timedelta(seconds=5))
|
|
||||||
m.periodic_tasks(None)
|
|
||||||
|
|
||||||
timeutils.advance_time_delta(datetime.timedelta(seconds=5))
|
|
||||||
idle = m.periodic_tasks(None)
|
|
||||||
self.assertAlmostEqual(10, idle, 1)
|
|
||||||
|
|
||||||
def test_periodic_tasks_immediate_runs_now(self):
|
|
||||||
fake_time = datetime.datetime(3000, 1, 1)
|
|
||||||
timeutils.set_time_override(fake_time)
|
|
||||||
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=10, run_immediately=True)
|
|
||||||
def bar(self, context):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
|
|
||||||
# Ensure initial values are correct
|
|
||||||
self.assertEqual(1, len(m._periodic_tasks))
|
|
||||||
task_name, task = m._periodic_tasks[0]
|
|
||||||
|
|
||||||
# Test task values
|
|
||||||
self.assertEqual('bar', task_name)
|
|
||||||
self.assertEqual(10, task._periodic_spacing)
|
|
||||||
self.assertEqual(True, task._periodic_enabled)
|
|
||||||
self.assertEqual(False, task._periodic_external_ok)
|
|
||||||
self.assertEqual(True, task._periodic_immediate)
|
|
||||||
self.assertEqual(None, task._periodic_last_run)
|
|
||||||
|
|
||||||
# Test the manager's representation of those values
|
|
||||||
self.assertEqual(10, m._periodic_spacing[task_name])
|
|
||||||
self.assertEqual(None, m._periodic_last_run[task_name])
|
|
||||||
|
|
||||||
idle = m.periodic_tasks(None)
|
|
||||||
self.assertEqual(datetime.datetime(3000, 1, 1, 0, 0),
|
|
||||||
m._periodic_last_run[task_name])
|
|
||||||
self.assertAlmostEqual(10, idle, 1)
|
|
||||||
|
|
||||||
timeutils.advance_time_delta(datetime.timedelta(seconds=5))
|
|
||||||
idle = m.periodic_tasks(None)
|
|
||||||
self.assertAlmostEqual(5, idle, 1)
|
|
||||||
|
|
||||||
def test_periodic_tasks_disabled(self):
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=-1)
|
|
||||||
def bar(self):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
idle = m.periodic_tasks(None)
|
|
||||||
self.assertAlmostEqual(60, idle, 1)
|
|
||||||
|
|
||||||
def test_external_running_here(self):
|
|
||||||
self.flags(run_external_periodic_tasks=True)
|
|
||||||
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=200, external_process_ok=True)
|
|
||||||
def bar(self):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
self.assertThat(m._periodic_tasks, matchers.HasLength(1))
|
|
||||||
|
|
||||||
def test_external_running_elsewhere(self):
|
|
||||||
self.flags(run_external_periodic_tasks=False)
|
|
||||||
|
|
||||||
class Manager(manager.Manager):
|
|
||||||
@manager.periodic_task(spacing=200, external_process_ok=True)
|
|
||||||
def bar(self):
|
|
||||||
return 'bar'
|
|
||||||
|
|
||||||
m = Manager()
|
|
||||||
self.assertEqual([], m._periodic_tasks)
|
|
||||||
Reference in New Issue
Block a user