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: 3169 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 8D2FE2405B for ; Wed, 27 Jul 2011 10:12:24 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 42106A18106 for ; Wed, 27 Jul 2011 10:12:24 +0000 (UTC) Received: by qwb8 with SMTP id 8so1043855qwb.11 for ; Wed, 27 Jul 2011 03:12:23 -0700 (PDT) Received: by 10.229.73.196 with SMTP id r4mr5694255qcj.266.1311761543552; Wed, 27 Jul 2011 03:12:23 -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 hl14cs140292qcb; Wed, 27 Jul 2011 03:12:23 -0700 (PDT) Received: by 10.227.199.68 with SMTP id er4mr5868641wbb.47.1311761541478; 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 fm6si2627856wbb.5.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-0003nx-Tk 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 DD1A42E8911 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: 52 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 52: Sigh, another problem in device type targeting: the target wasn't being put Message-Id: <20110727101220.12305.71306.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: fb0126fe8e5cf2c7c0be5d6e6f63f782da5a2662 ------------------------------------------------------------ revno: 52 committer: Michael-Doyle Hudson branch nick: trunk timestamp: Wed 2011-07-27 22:10:10 +1200 message: Sigh, another problem in device type targeting: the target wasn't being put into the json data before being given to the dispatcher. modified: lava_scheduler_app/tests.py lava_scheduler_daemon/dbjobsource.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-27 10:09:09 +0000 +++ lava_scheduler_app/tests.py 2011-07-27 10:10:10 +0000 @@ -190,7 +190,7 @@ def test_getJobForBoard_returns_json(self): device = self.factory.make_device(hostname='panda01') - definition = {'foo': 'bar'} + definition = {'foo': 'bar', 'target': 'panda01'} self.factory.make_testjob( requested_device=device, definition=json.dumps(definition)) transaction.commit() @@ -221,6 +221,7 @@ requested_device_type=panda_type, definition=json.dumps(definition)) transaction.commit() + definition['target'] = 'panda01' self.assertEqual( definition, DatabaseJobSource().getJobForBoard_impl('panda01')[0]) @@ -228,8 +229,8 @@ panda_type = self.factory.ensure_device_type(name='panda') panda01 = self.factory.make_device( hostname='panda01', device_type=panda_type) - first_definition = {'foo': 'bar'} - second_definition = {'foo': 'baz'} + first_definition = {'foo': 'bar', 'target': 'panda01'} + second_definition = {'foo': 'baz', 'target': 'panda01'} self.factory.make_testjob( requested_device=panda01, definition=json.dumps(first_definition), submit_time=datetime.datetime.now() - datetime.timedelta(days=1)) @@ -246,11 +247,11 @@ panda01 = self.factory.make_device( hostname='panda01', device_type=panda_type) type_definition = {'foo': 'bar'} - device_definition = {'foo': 'baz'} self.factory.make_testjob( requested_device_type=panda_type, definition=json.dumps(type_definition), submit_time=datetime.datetime.now() - datetime.timedelta(days=1)) + device_definition = {'foo': 'baz', 'target': 'panda01'} self.factory.make_testjob( requested_device=panda01, definition=json.dumps(device_definition)) @@ -264,7 +265,7 @@ panda01 = self.factory.make_device( hostname='panda01', device_type=panda_type) self.factory.make_device(hostname='panda02', device_type=panda_type) - definition = {'foo': 'bar'} + definition = {'foo': 'bar', 'target': 'panda01'} self.factory.make_testjob( requested_device=panda01, definition=json.dumps(definition)) === modified file 'lava_scheduler_daemon/dbjobsource.py' --- lava_scheduler_daemon/dbjobsource.py 2011-07-26 04:31:14 +0000 +++ lava_scheduler_daemon/dbjobsource.py 2011-07-27 10:10:10 +0000 @@ -62,8 +62,9 @@ job.log_file.save( 'job-%s.log' % job.id, ContentFile(''), save=False) job.save() + json_data = json.loads(job.definition) + json_data['target'] = device.hostname transaction.commit() - json_data = json.loads(job.definition) log_file = job.log_file log_file.file.close() log_file.open('wb')