From patchwork Thu Sep 5 23:59:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 19796 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DED6524869 for ; Thu, 5 Sep 2013 23:59:31 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id e16sf2572863qcx.1 for ; Thu, 05 Sep 2013 16:59:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=T9Zs7rft3nECsyiuRijFBAG91Ojl6A6WIGo1Scy2m9k=; b=mDNtsdWIBdCn4i7LhLHFK3nH6FpXs7Aa/Lkuec0GyMfDUtArvBiLgkd6yzsx5tsH+K SNWPYtV758j9q9bqTaRotVf7ZRhlRmYnzc9asKv+31OeEYu2sprhgfS4Gzx8uFbS7XGo ALIKnZIn6BwybEn2lYGva/yP2bW6rrMHg+AUq8hZjDXfahySHDW7gdL+HQrJqhscCJ5A DCvNCcfQHGbxkE6xtDUIj5xjrOH0bQsN4H486cNmZ+yvZgkZITL1SeheQrNTT3vEX3Ge yfkEv6v+broKrZbTRN0DDETIXcdwZ/QZx76QO4A5b9WBNDSFycFpB/jwRZIAgJZjhP1L XdBQ== X-Received: by 10.236.31.2 with SMTP id l2mr3978491yha.36.1378425571278; Thu, 05 Sep 2013 16:59:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.98.198 with SMTP id ek6ls760848qeb.45.gmail; Thu, 05 Sep 2013 16:59:31 -0700 (PDT) X-Received: by 10.58.146.71 with SMTP id ta7mr9698322veb.23.1378425571123; Thu, 05 Sep 2013 16:59:31 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id dn2si7959893vcb.134.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Sep 2013 16:59:31 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ht10so1664060vcb.24 for ; Thu, 05 Sep 2013 16:59:31 -0700 (PDT) X-Gm-Message-State: ALoCoQnsvqU2cLCRdwXeQPCgOlkoUtzAYoQ1eiD8+FNi8qPaZiO1vji08guZDS9rDIB+zgCVPMeM X-Received: by 10.220.91.16 with SMTP id k16mr5300890vcm.21.1378425570985; Thu, 05 Sep 2013 16:59:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp309073vcz; Thu, 5 Sep 2013 16:59:30 -0700 (PDT) X-Received: by 10.180.182.15 with SMTP id ea15mr8186255wic.16.1378425569408; Thu, 05 Sep 2013 16:59:29 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fb7si4102604wid.87.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 05 Sep 2013 16:59:29 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VHjSS-0006wQ-MX for ; Thu, 05 Sep 2013 23:59:28 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 97793E96CF for ; Thu, 5 Sep 2013 23:59:28 +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: 673 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 673: Fix Android image error messaging Message-Id: <20130905235928.2848.59278.launchpad@ackee.canonical.com> Date: Thu, 05 Sep 2013 23:59:28 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16758"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: a5e0a3633975d4adc49e032b95b4a703ff82b08d X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Tyler Baker (tyler-baker) Related merge proposals: https://code.launchpad.net/~tyler-baker/lava-dispatcher/fix-android-error-messages/+merge/183998 proposed by: Tyler Baker (tyler-baker) review: Approve - Antonio Terceiro (terceiro) ------------------------------------------------------------ revno: 673 [merge] committer: Tyler Baker branch nick: lava-dispatcher timestamp: Thu 2013-09-05 16:58:28 -0700 message: Fix Android image error messaging modified: lava_dispatcher/client/base.py --- 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 2013-09-03 15:16:49 +0000 +++ lava_dispatcher/client/base.py 2013-09-05 00:10:08 +0000 @@ -30,7 +30,6 @@ import lava_dispatcher.utils as utils from lava_dispatcher.errors import ( - GeneralError, NetworkError, OperationFailed, CriticalError, @@ -330,7 +329,9 @@ response=[activity_pat], timeout=timeout, wait_prompt=False) except pexpect.TIMEOUT: - raise GeneralError('The home screen has not displayed') + msg = "The home screen was not displayed" + logging.critical(msg) + raise CriticalError(msg) finally: #send ctrl+c to exit the logcat command, #and make the latter command can be run on the normal @@ -513,7 +514,7 @@ in_linaro_android_image = False while (attempts < boot_attempts) and (not in_linaro_android_image): - logging.info("Booting the android test image. Attempt: %d" % + logging.info("Booting the Android test image. Attempt: %d" % (attempts + 1)) TESTER_PS1_PATTERN = self.target_device.deployment_data[ 'TESTER_PS1_PATTERN'] @@ -522,7 +523,7 @@ try: self._boot_linaro_android_image() except (OperationFailed, pexpect.TIMEOUT) as e: - msg = "Failed to boot Linaro Android Image: %s" % e + msg = "Failed to boot the Android test image: %s" % e logging.info(msg) attempts += 1 continue @@ -577,7 +578,9 @@ in_linaro_android_image = True if not in_linaro_android_image: - raise OperationFailed("booting into android test image failed") + msg = "Could not get the Android test image booted properly" + logging.critical(msg) + raise CriticalError(msg) #check if the adb connection can be created. #by adb connect dev_ip command