From patchwork Mon Aug 13 13:56:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Doan X-Patchwork-Id: 10706 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 1B3BB23E56 for ; Mon, 13 Aug 2012 13:56:14 +0000 (UTC) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by fiordland.canonical.com (Postfix) with ESMTP id 090A3A18141 for ; Mon, 13 Aug 2012 13:56:14 +0000 (UTC) Received: by wibhq12 with SMTP id hq12so2862198wib.17 for ; Mon, 13 Aug 2012 06:56:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=0n9jDiHCd7awzrq181Nj/Dwo9eXpti0R8ikjcJSVaXE=; b=MTCbHuoq0aDLYC8hEhz6YYZp3UBeWMPxfRR37lbu+lnI012Dh6nPMFBfrNuMsGBXc6 FcVTTsNolhbRYeOiIysLrsGZgJYm1v9y+ZOrXWb6buKTucLT9mptPY3tRHpfdkfs7h9A FHuflg2ToIBjzBLGn2DE3a1uAzmhdJ9q7AC7c84cTlziBrw7nCmzlNqCyKAL7CkbM/3b +8eBCaI5/4LUj1fpDtyYehOO05VCGIPRkpN3cONHdAnoPAIvKoHDCL7kDkigsRNHxGnX L3rAwftx98SVwijqtgwM0VDRjulC+pjUPcYybk4LyX+iYoK2spceEBX35o2Pm496SZOs xhJQ== Received: by 10.50.6.229 with SMTP id e5mr5625638iga.9.1344866173241; Mon, 13 Aug 2012 06:56:13 -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.50.184.200 with SMTP id ew8csp179227igc; Mon, 13 Aug 2012 06:56:12 -0700 (PDT) Received: by 10.180.74.33 with SMTP id q1mr18781841wiv.4.1344866171433; Mon, 13 Aug 2012 06:56:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id c21si9695438wem.105.2012.08.13.06.56.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 06:56:11 -0700 (PDT) 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 1T0v7q-0004Qf-Lv for ; Mon, 13 Aug 2012 13:56:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 9750AE0041 for ; Mon, 13 Aug 2012 13:56:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 367 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 367: fix some disablesuspend issues with fastmodel Message-Id: <20120813135610.26170.50262.launchpad@ackee.canonical.com> Date: Mon, 13 Aug 2012 13:56:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15791"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ee1981a4ed9a9a351f937e5711e38075b0fd6473 X-Gm-Message-State: ALoCoQlBcquVVqSHKYZaaOGXTNOgjpGSfKmxL7mEwQN2iozhodh7A8TYCR0Kg8cReS+f7ZvYj5yR Merge authors: Andy Doan (doanac) ------------------------------------------------------------ revno: 367 [merge] committer: Andy Doan branch nick: lava-dispatcher timestamp: Fri 2012-08-10 09:27:14 -0500 message: fix some disablesuspend issues with fastmodel modified: lava_dispatcher/client/base.py lava_dispatcher/client/fastmodel.py lava_dispatcher/config.py lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel.conf --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/client/base.py' --- lava_dispatcher/client/base.py 2012-08-02 23:05:53 +0000 +++ lava_dispatcher/client/base.py 2012-08-08 22:31:12 +0000 @@ -472,9 +472,8 @@ else: logging.info("Skip raising exception on the home screen has not displayed for health check jobs") - # we need to deal with the time the "input keyevent 82" takes - # 240: for fastmodels, 120 failed, 180 failed some - session.run('/system/bin/disablesuspend.sh', timeout=240) + timeout = self.config.getint("disablesuspend_timeout", 240) + session.run('/system/bin/disablesuspend.sh', timeout=timeout) def _enable_network(self): session = TesterCommandRunner(self, wait_for_rc=False) === modified file 'lava_dispatcher/client/fastmodel.py' --- lava_dispatcher/client/fastmodel.py 2012-08-02 23:18:23 +0000 +++ lava_dispatcher/client/fastmodel.py 2012-08-08 22:26:59 +0000 @@ -91,7 +91,7 @@ logging_system('sudo rm -f %s' % wallpaper) with image_partition_mounted(self._sd_image, self.SYS_PARTITION) as d: - script_path = '%s/%s' % (d, '/system/bin/disablesuspend.sh') + script_path = '%s/%s' % (d, 'bin/disablesuspend.sh') if self.git_url_disablesuspend_sh: logging_system('sudo wget %s -O %s' % ( self.git_url_disablesuspend_sh, === modified file 'lava_dispatcher/config.py' --- lava_dispatcher/config.py 2012-06-25 19:42:56 +0000 +++ lava_dispatcher/config.py 2012-08-08 22:30:52 +0000 @@ -86,8 +86,14 @@ return default else: raise - def getint(self, key): - return self.cp.getint("DEFAULT", key) + def getint(self, key, default=_sentinel): + try: + return self.cp.getint("DEFAULT", key) + except NoOptionError: + if default is not _sentinel: + return default + else: + raise def getboolean(self, key, default=True): try: === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-08-01 17:52:55 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-08-08 22:31:12 +0000 @@ -53,7 +53,7 @@ # # This is used to regenerate init script when Android bootup for partitions are # changed if deployed in LAVA test image -# +# # boot partition number in original Android, counting from 1 boot_part_android_org = 1 # sys partition number in original Android, counting from 1 @@ -69,7 +69,7 @@ # # This is used to regenerate init script when Android bootup for partitions are # changed if deployed in LAVA test image -# +# # sys partition number in LAVA test image, counting from 1 sys_part_android = 5 # sdcard partition number in LAVA test image, counting from 1 @@ -107,7 +107,7 @@ # The value to pass to qemu-system-arm's -M option. qemu_machine_type = %(device_type)s -# QEMU drive interface. +# QEMU drive interface. qemu_drive_interface = sd # This is used for snowball soft reset fix, since the reboot command is hanging. @@ -118,4 +118,5 @@ # the url of disablesusepend.sh script in android git repository git_url_disablesuspend_sh = "http://android.git.linaro.org/gitweb?p=device/linaro/common.git;a=blob_plain;f=disablesuspend.sh;hb=refs/heads/linaro-ics" - +# how long the disablesuspend script should take to complete +#disablesuspend_timeout = 240 === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel.conf 2012-07-10 02:42:13 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/fastmodel.conf 2012-08-10 14:27:14 +0000 @@ -4,5 +4,6 @@ # The license server must also be specified. eg: #license_server = 8224@192.168.1.10 -# the url of disablesusepend.sh script in android git repository -git_url_disablesuspend_sh = "http://android.git.linaro.org/gitweb?p=device/linaro/common.git;a=blob_plain;f=disablesuspend.sh;hb=refs/heads/linaro-ics" +# how long the disablesuspend script should take to complete +# fm takes longer than other android images do +disablesuspend_timeout = 500