From patchwork Fri Dec 9 08:32:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spring Zhang X-Patchwork-Id: 5554 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 4786F23E0D for ; Fri, 9 Dec 2011 08:32:15 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 31C6AA18003 for ; Fri, 9 Dec 2011 08:32:15 +0000 (UTC) Received: by bke17 with SMTP id 17so3582774bke.11 for ; Fri, 09 Dec 2011 00:32:15 -0800 (PST) Received: by 10.204.152.83 with SMTP id f19mr3153264bkw.90.1323419534791; Fri, 09 Dec 2011 00:32:14 -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 hg2cs109609bkc; Fri, 9 Dec 2011 00:32:14 -0800 (PST) Received: by 10.180.102.4 with SMTP id fk4mr10073372wib.15.1323419533358; Fri, 09 Dec 2011 00:32:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id h50si3198635wee.146.2011.12.09.00.32.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Dec 2011 00:32: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 1RYvsL-0006Nt-2Y for ; Fri, 09 Dec 2011 08:32:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 076A6E15B6 for ; Fri, 9 Dec 2011 08:32:13 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-test X-Launchpad-Branch: ~linaro-validation/lava-test/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 105 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-test/trunk] Rev 105: Update parse function using in LTP test suite to fix 900694 Message-Id: <20111209083213.22779.21821.launchpad@ackee.canonical.com> Date: Fri, 09 Dec 2011 08:32:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14450"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: e2d897faa18585d3c30bb6c6e087938cccfeef65 Merge authors: Spring Zhang (qzhang) Related merge proposals: https://code.launchpad.net/~qzhang/lava-test/fix-900694/+merge/84709 proposed by: Spring Zhang (qzhang) review: Approve - Le Chi Thu (le-chi-thu) review: Resubmit - Spring Zhang (qzhang) ------------------------------------------------------------ revno: 105 [merge] committer: Spring Zhang branch nick: fix-900694 timestamp: Fri 2011-12-09 16:29:45 +0800 message: Update parse function using in LTP test suite to fix 900694 modified: lava_test/test_definitions/ltp.py --- lp:lava-test https://code.launchpad.net/~linaro-validation/lava-test/trunk You are subscribed to branch lp:lava-test. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-test/trunk/+edit-subscription === modified file 'lava_test/test_definitions/ltp.py' --- lava_test/test_definitions/ltp.py 2011-10-20 12:12:15 +0000 +++ lava_test/test_definitions/ltp.py 2011-12-08 03:21:11 +0000 @@ -51,8 +51,9 @@ class LTPParser(TestParser): - def parse(self): - filename = "testoutput.log" + def parse(self, artifacts): + filename = artifacts.stdout_pathname + print "filename=%s" %filename pat = re.compile(self.pattern) with open(filename, 'r') as fd: for line in fd.readlines(): @@ -65,12 +66,8 @@ if subid == '0': continue results['test_case_id'] += "." + subid - self.results['test_results'].append(results) - if self.fixupdict: - self.fixresults(self.fixupdict) - if self.appendall: - self.appendtoall(self.appendall) - self.fixids() + self.results['test_results'].append( + self.analyze_test_result(results)) ltpinst = TestInstaller(INSTALLSTEPS, deps=DEPS, url=URL,