diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 107: fix two kinds of test brokeness, one with a massive massive hack

Message ID 20111214021212.11170.3710.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson Dec. 14, 2011, 2:12 a.m. UTC 
------------------------------------------------------------
revno: 107
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Wed 2011-12-14 15:10:04 +1300
message:
  fix two kinds of test brokeness, one with a massive massive hack
modified:
  lava_scheduler_app/tests.py


--
lp:lava-scheduler
https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk

You are subscribed to branch lp:lava-scheduler.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_scheduler_app/tests.py'
--- lava_scheduler_app/tests.py	2011-08-19 03:38:44 +0000
+++ lava_scheduler_app/tests.py	2011-12-14 02:10:04 +0000
@@ -26,6 +26,9 @@ 
         self._use_datetime = True
 
     def request(self, host, handler, request_body, verbose=0):
+        from django.conf import settings
+        # This is a total hack.  See bug 904054 for more.
+        settings.MOUNT_POINT = ''
         self.verbose = verbose
         response = self.client.post(
             handler, request_body, content_type="text/xml")
@@ -335,23 +338,33 @@ 
         DatabaseJobSource().getJobForBoard_impl('panda01')
         return device, job
 
-    def test_jobCompleted_set_statuses(self):
+    def test_jobCompleted_set_statuses_success(self):
         device, job = self.get_device_and_running_job()
         transaction.commit()
-        DatabaseJobSource().jobCompleted_impl('panda01')
+        DatabaseJobSource().jobCompleted_impl('panda01', 0)
         job = TestJob.objects.get(pk=job.pk)
         device = Device.objects.get(pk=device.pk)
         self.assertEqual(
             (Device.IDLE, TestJob.COMPLETE),
             (device.status, job.status))
 
+    def test_jobCompleted_set_statuses_failure(self):
+        device, job = self.get_device_and_running_job()
+        transaction.commit()
+        DatabaseJobSource().jobCompleted_impl('panda01', 1)
+        job = TestJob.objects.get(pk=job.pk)
+        device = Device.objects.get(pk=device.pk)
+        self.assertEqual(
+            (Device.IDLE, TestJob.INCOMPLETE),
+            (device.status, job.status))
+
     def test_jobCompleted_works_on_device_type_targeted(self):
         device = self.factory.make_device(hostname='panda01')
         job = self.factory.make_testjob(
             requested_device_type=device.device_type)
         transaction.commit()
         DatabaseJobSource().getJobForBoard_impl('panda01')
-        DatabaseJobSource().jobCompleted_impl('panda01')
+        DatabaseJobSource().jobCompleted_impl('panda01', 0)
         job = TestJob.objects.get(pk=job.pk)
         device = Device.objects.get(pk=device.pk)
         self.assertEqual(
@@ -362,7 +375,7 @@ 
         device, job = self.get_device_and_running_job()
         before = datetime.datetime.now()
         transaction.commit()
-        DatabaseJobSource().jobCompleted_impl('panda01')
+        DatabaseJobSource().jobCompleted_impl('panda01', 0)
         after = datetime.datetime.now()
         job = TestJob.objects.get(pk=job.pk)
         self.assertTrue(before < job.end_time < after)
@@ -370,7 +383,7 @@ 
     def test_jobCompleted_clears_current_job(self):
         device, job = self.get_device_and_running_job()
         transaction.commit()
-        DatabaseJobSource().jobCompleted_impl('panda01')
+        DatabaseJobSource().jobCompleted_impl('panda01', 0)
         device = Device.objects.get(pk=device.pk)
         self.assertEquals(None, device.current_job)