From patchwork Wed Jul 27 10:12:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 3170 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 85AA723F3F for ; Wed, 27 Jul 2011 10:12:24 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 4D615A18122 for ; Wed, 27 Jul 2011 10:12:24 +0000 (UTC) Received: by qyk10 with SMTP id 10so2491516qyk.11 for ; Wed, 27 Jul 2011 03:12:23 -0700 (PDT) Received: by 10.229.44.19 with SMTP id y19mr5701986qce.190.1311761542955; Wed, 27 Jul 2011 03:12:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs140291qcb; Wed, 27 Jul 2011 03:12:22 -0700 (PDT) Received: by 10.227.2.81 with SMTP id 17mr6143152wbi.15.1311761541619; Wed, 27 Jul 2011 03:12:21 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fp4si2611833wbb.91.2011.07.27.03.12.21; Wed, 27 Jul 2011 03:12:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qm16C-0003no-QD for ; Wed, 27 Jul 2011 10:12:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id C362A2E8911 for ; Wed, 27 Jul 2011 10:12:20 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 51 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Wed, 27 Jul 2011 10:12:20 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13503"; Instance="initZopeless config overlay" X-Launchpad-Hash: f704f8dabd421b73f5a17b05301e29f9c7285f4e ------------------------------------------------------------ revno: 51 committer: Michael-Doyle Hudson 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 === 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(