commit 2fe3f1df42f5fd1dc6296219df289851dcf77025
author showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Mon Jul 06 20:19:11 2009 +0000
committer showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Mon Jul 06 20:19:11 2009 +0000
tree e3f8e4998d023aae884164b64cd25c51af23c156
parent 3ed34fd6fa69b0d1faba7b67ab32225b63b64781

Enter all Verify/Cleanup/Repair tasks into the special_tasks table. Also
keep track of which Host Queue Entry (if any) each Verify/Cleanup/Repair
task belongs to. Additionally, implement recovery for jobs in
Verify/Cleanup/Repair (i.e., do not simply reverify the host and requeue
the job).

Risk: medium (scheduler changes)
Visibility: medium (functionality change)

Signed-off-by: James Ren <jamesren@google.com>


git-svn-id: http://test.kernel.org/svn/autotest/trunk@3372 592f7852-d20e-0410-864c-8624ca9c26a4

scheduler/monitor_db_unittest.py

diff --git a/scheduler/monitor_db_unittest.py b/scheduler/monitor_db_unittest.py
index b5607a1..bf5014c 100644
--- a/scheduler/monitor_db_unittest.py
+++ b/scheduler/monitor_db_unittest.py
@@ -1460,10 +1460,10 @@
         self.assert_(isinstance(repair_task, monitor_db.RepairTask))
         self.assertEquals(verify_task.host, repair_task.host)
         if verify_task.queue_entry:
-            self.assertEquals(repair_task.queue_entry_to_fail,
+            self.assertEquals(repair_task.queue_entry,
                               verify_task.queue_entry)
         else:
-            self.assertEquals(repair_task.queue_entry_to_fail, None)
+            self.assertEquals(repair_task.queue_entry, None)
 
 
     def _test_verify_task_helper(self, success, use_queue_entry=False,
@@ -1710,7 +1710,7 @@
         repair_task = task.failure_tasks[0]
         self.assert_(isinstance(repair_task, monitor_db.RepairTask))
         if use_queue_entry:
-            self.assertEquals(repair_task.queue_entry_to_fail, self.queue_entry)
+            self.assertEquals(repair_task.queue_entry, self.queue_entry)
 
         self.run_task(task, success)