From patchwork Thu Oct 20 21:26:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 4761 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 95F6F23E51 for ; Thu, 20 Oct 2011 21:26:15 +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 82DF0A181EC for ; Thu, 20 Oct 2011 21:26:15 +0000 (UTC) Received: by eyg5 with SMTP id 5so4233585eyg.11 for ; Thu, 20 Oct 2011 14:26:15 -0700 (PDT) Received: by 10.223.91.143 with SMTP id n15mr15042022fam.23.1319145975171; Thu, 20 Oct 2011 14:26:15 -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.152.1.71 with SMTP id 7cs139544lak; Thu, 20 Oct 2011 14:26:14 -0700 (PDT) Received: by 10.216.156.204 with SMTP id m54mr4510790wek.27.1319145974122; Thu, 20 Oct 2011 14:26:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id c52si8056215wed.82.2011.10.20.14.26.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Oct 2011 14:26:14 -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 1RH07x-0007qc-EZ for ; Thu, 20 Oct 2011 21:26:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 64B2BFB7BA for ; Thu, 20 Oct 2011 21:26: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: 104 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-test/trunk] Rev 104: fix a bug with tiobench Message-Id: <20111020212613.25966.5368.launchpad@ackee.canonical.com> Date: Thu, 20 Oct 2011 21:26: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="14165"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 409b36ab4137cb0bd46eb1f1c3574425b0266b00 Merge authors: Le Chi Thu le.chi.thu@linaro.org Related merge proposals: https://code.launchpad.net/~le-chi-thu/lava-test/override-test-options/+merge/80002 proposed by: Le Chi Thu (le-chi-thu) review: Approve - Paul Larson (pwlars) ------------------------------------------------------------ revno: 104 [merge] tags: release-0.3.1, 2011.10 committer: Paul Larson branch nick: lava-test timestamp: Thu 2011-10-20 16:23:47 -0500 message: fix a bug with tiobench modified: lava_test/test_definitions/tiobench.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/tiobench.py' --- lava_test/test_definitions/tiobench.py 2011-10-20 12:12:15 +0000 +++ lava_test/test_definitions/tiobench.py 2011-10-20 18:45:45 +0000 @@ -39,7 +39,7 @@ class TIObenchTestParser(TestParser): - def parse(self): + def parse(self, artifacts): # Pattern to match the test case name pattern1="(?P^(Sequential|Random) (Writes|Reads))" # Pattern to match the parameter details and measurement @@ -50,7 +50,7 @@ pat2 = re.compile(pattern2) tc_id = None with open(filename) as fd: - for line in fd: + for lineno, line in enumerate(fd, 1): match1 = pat1.match(line) match2 = pat2.search(line) if match1: @@ -62,11 +62,10 @@ results['test_case_id'] = ( '%s_%sMBfilesize_%sbytesblksize') % ( tc_id, filesize, blks_size) - self.results['test_results'].append(results) - - if self.appendall: - self.appendtoall(self.appendall) - self.fixmeasurements() + results["log_filename"] = "testoutput.log" + results["log_lineno"] = lineno + self.results['test_results'].append( + self.analyze_test_result(results)) tiobench_inst = TestInstaller(INSTALLSTEPS, url=URL, md5=MD5)