diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 51: fix some tests broken by semantic merge conflict

Message ID 20110727101220.12305.90125.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson July 27, 2011, 10:12 a.m. UTC 
------------------------------------------------------------
revno: 51
committer: Michael-Doyle Hudson <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Wed 2011-07-27 22:09:09 +1200
message:
  fix some tests broken by semantic merge conflict
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-07-26 05:00:31 +0000
+++ lava_scheduler_app/tests.py	2011-07-27 10:09:09 +0000
@@ -201,7 +201,7 @@ 
         device = self.factory.make_device(hostname='panda01')
         definition = {'foo': 'bar'}
         self.factory.make_testjob(
-            target=device, definition=json.dumps(definition))
+            requested_device=device, definition=json.dumps(definition))
         transaction.commit()
         log_file = DatabaseJobSource().getJobForBoard_impl('panda01')[1]
         log_file.write('a')
@@ -329,7 +329,7 @@ 
             requested_device_type=device.device_type)
         transaction.commit()
         DatabaseJobSource().getJobForBoard_impl('panda01')
-        DatabaseJobSource().jobCompleted_impl('panda01', None)
+        DatabaseJobSource().jobCompleted_impl('panda01')
         job = TestJob.objects.get(pk=job.pk)
         device = Device.objects.get(pk=device.pk)
         self.assertEqual(