Host scheduler refactoring. Move HostScheduler out of monitor_db.

scheduler/monitor_db_functional_test.py

 #!/usr/bin/python
 
 import logging, os, unittest
 import common
 from autotest_lib.client.common_lib import enum, global_config, host_protections
 from autotest_lib.database import database_connection
 from autotest_lib.frontend import setup_django_environment
 from autotest_lib.frontend.afe import frontend_test_utils, models
 from autotest_lib.frontend.afe import model_attributes
-from autotest_lib.scheduler import drone_manager, email_manager, monitor_db
-from autotest_lib.scheduler import scheduler_models
+from autotest_lib.scheduler import drone_manager, email_manager, host_scheduler
+from autotest_lib.scheduler import monitor_db, scheduler_models
 
 # translations necessary for scheduler queries to work with SQLite
 _re_translator = database_connection.TranslatingDatabase.make_regexp_translator
 _DB_TRANSLATORS = (
         _re_translator(r'NOW\(\)', 'time("now")'),
         _re_translator(r'LAST_INSERT_ID\(\)', 'LAST_INSERT_ROWID()'),
         # older SQLite doesn't support group_concat, so just don't bother until
         # it arises in an important query
         _re_translator(r'GROUP_CONCAT\((.*?)\)', r'\1'),
 )
@@ skipping 702 matching lines @@
                 host=queue_entry.host,
                 task=models.SpecialTask.Task.VERIFY,
                 requested_by=models.User.current_user())
         models.SpecialTask.objects.create(
                 host=queue_entry.host,
                 task=models.SpecialTask.Task.CLEANUP,
                 queue_entry=queue_entry,
                 is_complete=True,
                 requested_by=models.User.current_user())
 
-        self.assertRaises(monitor_db.SchedulerError, self._initialize_test)
+        self.assertRaises(host_scheduler.SchedulerError, self._initialize_test)
 
 
     def _test_recover_verifying_hqe_helper(self, task, pidfile_type):
         _, queue_entry = self._make_job_and_queue_entry()
         queue_entry.status = HqeStatus.VERIFYING
         queue_entry.save()
 
         special_task = models.SpecialTask.objects.create(
                 host=queue_entry.host, task=task, queue_entry=queue_entry)
 
@@ skipping 323 matching lines @@
         self.assert_(job_keyval_path in attached_files, attached_files)
         keyval_contents = attached_files[job_keyval_path]
         keyval_dict = dict(line.strip().split('=', 1)
                            for line in keyval_contents.splitlines())
         self.assert_('job_queued' in keyval_dict, keyval_dict)
         self.assertEquals(keyval_dict['mykey'], 'myvalue')
 
 
 if __name__ == '__main__':
     unittest.main()