From patchwork Tue Dec 4 22:19:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 13361 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 6454E23E0D for ; Tue, 4 Dec 2012 22:19:14 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id ED1C3A1852E for ; Tue, 4 Dec 2012 22:19:13 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id c10so6794817ieb.11 for ; Tue, 04 Dec 2012 14:19:13 -0800 (PST) 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=NsHlZ1oVfcR6f2/OWSX0rHUOfQnTrNuIauW3Z6KirUg=; b=aQgMjXKYjC39o3AluLDEqAr4QZkqz8SCLYPAmtssjTiylR6G6CZF22Xw/Uabi4dFLF YQBdcr5NSvupiR7CHNaK9ELx5EYSaN+Qylr8dNvtemhJ9OpiQ5U3HBm+mJt+oi065ZfM /MdQ3d+/w1Bg4hFWkVFbIlLl7MMcrkVVYV4PylISU8aFF0dIn6FbiViUst9r3mI+8ewN k82ZYpZPAc35fCLuhwti1ZbfkPm7e0FFCb6uvnQza0tYVhEf0BDRfszXaCCkBxUZTGi2 B3XbnGz9sGJX0Y4X5upX88chIagVqEI/7vA4sgSyrTwMhS0fQ3fK6UhF8CExBzfL7aPM ueiw== Received: by 10.50.36.164 with SMTP id r4mr4287696igj.57.1354659553233; Tue, 04 Dec 2012 14:19:13 -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.50.67.148 with SMTP id n20csp298622igt; Tue, 4 Dec 2012 14:19:12 -0800 (PST) Received: by 10.180.88.99 with SMTP id bf3mr7012839wib.22.1354659551598; Tue, 04 Dec 2012 14:19:11 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id i71si1702433weo.56.2012.12.04.14.19.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 04 Dec 2012 14:19:11 -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 1Tg0pa-0004ru-I5 for ; Tue, 04 Dec 2012 22:19:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 70143E01F3 for ; Tue, 4 Dec 2012 22:19: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: 483 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 483: more fixes for signal things Message-Id: <20121204221910.13279.21600.launchpad@ackee.canonical.com> Date: Tue, 04 Dec 2012 22:19: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="16335"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c4738149b4106d6ae13dcfac536d3a84e6e96d7f X-Gm-Message-State: ALoCoQkE6st2fJRSX1w18oR6xS5nfredeLnhjpxmj3QvpEVdbE73l4f8GNy3pGXMvuescF1sQFdt Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-dispatcher/more-signal-fixes/+merge/138009 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 483 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Wed 2012-12-05 11:18:26 +1300 message: more fixes for signal things modified: lava_dispatcher/lava_test_shell.py lava_test_shell/lava-test-case lava_test_shell/lava-test-case-attach lava_test_shell/lava-test-runner-ubuntu --- 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/lava_test_shell.py' --- lava_dispatcher/lava_test_shell.py 2012-12-03 19:41:16 +0000 +++ lava_dispatcher/lava_test_shell.py 2012-12-04 21:47:49 +0000 @@ -265,7 +265,12 @@ attributes = _attributes_from_dir(os.path.join(test_run_dir, 'attributes')) testdef = yaml.load(testdef) - swcontext = _get_sw_context(build, pkginfo, testdefs_by_uuid[uuid]._sw_sources) + if uuid in testdefs_by_uuid: + sw_sources = testdefs_by_uuid[uuid]._sw_sources + else: + logging.warning("no software sources found for run with uuid %s" % uuid) + sw_sources = [] + swcontext = _get_sw_context(build, pkginfo, sw_sources) return { 'test_id': testdef.get('metadata').get('name'), === modified file 'lava_test_shell/lava-test-case' --- lava_test_shell/lava-test-case 2012-12-04 14:19:38 +0000 +++ lava_test_shell/lava-test-case 2012-12-04 21:55:35 +0000 @@ -74,4 +74,4 @@ if [ -n "${MEASUREMENT+x}" ]; then echo $MEASUREMENT > $result_dir/measurement fi -[ -n "${rc+x}" ] && exit $rc +exit $rc === modified file 'lava_test_shell/lava-test-case-attach' --- lava_test_shell/lava-test-case-attach 2012-11-21 01:33:01 +0000 +++ lava_test_shell/lava-test-case-attach 2012-12-04 21:51:15 +0000 @@ -4,7 +4,7 @@ # basename is not present on AOSP builds, but the /*\// thing does not # work with dash (Ubuntu builds) or busybox (OpenEmbedded). Both of # those have basename though. -which basename || basename () { echo ${1/*\//}; } +which basename > /dev/null || basename () { echo ${1/*\//}; } usage () { echo "Usage: lava-test-case-attach TEST_CASE_ID FILE [MIME_TYPE]" === modified file 'lava_test_shell/lava-test-runner-ubuntu' --- lava_test_shell/lava-test-runner-ubuntu 2012-12-03 19:40:49 +0000 +++ lava_test_shell/lava-test-runner-ubuntu 2012-12-04 21:51:35 +0000 @@ -1,8 +1,5 @@ #!/bin/bash -# make sure we log to serial console -exec >/dev/console - # This is a total hack to make sure we wait until the shell prompt has # appeared before sending any signals. sleep 15 @@ -75,7 +72,7 @@ swcontext echo "${PREFIX} looking for work in ${WORKFILE}" -while read line ; do +while read -u 9 line ; do test=`basename $line` echo "${PREFIX} running ${test} under lava-test-shell..." odir=${RESULTSDIR}/${test}-`date +%s` @@ -93,5 +90,5 @@ # so be sure to use bash lava-test-shell --output_dir ${odir} /bin/bash -e "${line}/run.sh" echo "${PREFIX} ${test} exited with: `cat ${odir}/return_code`" -done < ${WORKFILE} +done 9< ${WORKFILE}