From patchwork Wed Dec 14 02:12:12 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: 5647 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 2830C23E19 for ; Wed, 14 Dec 2011 02:12:17 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1746AA18230 for ; Wed, 14 Dec 2011 02:12:17 +0000 (UTC) Received: by eaa13 with SMTP id 13so442922eaa.11 for ; Tue, 13 Dec 2011 18:12:17 -0800 (PST) Received: by 10.204.156.208 with SMTP id y16mr127132bkw.72.1323828736847; Tue, 13 Dec 2011 18:12:16 -0800 (PST) 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.205.129.2 with SMTP id hg2cs98586bkc; Tue, 13 Dec 2011 18:12:14 -0800 (PST) Received: by 10.180.90.234 with SMTP id bz10mr1399795wib.46.1323828733383; Tue, 13 Dec 2011 18:12:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id 8si539006wel.107.2011.12.13.18.12.13 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Dec 2011 18:12:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RaeKK-0002Wm-VP for ; Wed, 14 Dec 2011 02:12:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id DFCFCE03B3 for ; Wed, 14 Dec 2011 02:12:12 +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: 107 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Wed, 14 Dec 2011 02:12:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14487"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 4eed6f7df9dd319e7a7c956f0099bea1e1a91156 ------------------------------------------------------------ revno: 107 committer: Michael Hudson-Doyle 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 === 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)