Merge lp:~liuyq0307/lava-android-test/monkeyrunner-parser into lp:lava-android-test

[Yongqin Liu]

add parser for monkeyrunner test to parse the result that genereated by monkeyrunner script
has been tested locally, and the result is here:
http://staging.validation.linaro.org/dashboard/streams/anonymous/bundles/d3b71cc31a3432bd1b7c193da45c5d31d963e3c4/

[Yongqin Liu (liuyq0307)]

not tested yet, will change the status to "Needs review" after tested.

[Michael Hudson-Doyle (mwhudson)]

I assume you have tested this now? It seems OK, but this bit:

        self.pattern = ("^\s*(?P<test_case_id>.*?)\s*="
                        "\s*(?P<measure_units>.+)\s*$")
        try:
            pat = re.compile(self.pattern)
        except Exception as strerror:
            raise RuntimeError(("MonkeyrunnerTestParser - Invalid regular"
                   " expression '%s'- %s") % (self.pattern, strerror))

seems overly complicated. Surely just "pat = re.compile(...)" is fine?

review: Approve

=== modified file 'lava_android_test/commands.py'
--- lava_android_test/commands.py	2012-08-17 02:03:02 +0000
+++ lava_android_test/commands.py	2012-08-23 03:22:20 +0000
@@ -580,6 +580,8 @@
         self.say_begin(tip_msg)
         bundles = []
         for script in script_list:
+            if "monkeycommon.py" == os.path.basename(script):
+                continue
             sub_bundle = {}
             from datetime import datetime
             starttime = datetime.utcnow()
@@ -624,7 +626,9 @@
         inst = AndroidTestInstaller()
         run = AndroidTestRunner(steps_host_pre=[
                                 'monkeyrunner %s %s' % (script, serial)])
-        parser = AndroidTestParser()
+        parser = MonkeyrunnerTestParser()
+        parser.monkeyrunner_result = os.path.join(os.path.dirname(script),
+                                                  'results.txt')
         test = AndroidTest(testname='monkeyrunner',
                             installer=inst, runner=run, parser=parser)
         test.parser.results = {'test_results': []}
@@ -656,6 +660,42 @@
         return bundle
 
 
+class MonkeyrunnerTestParser(AndroidTestParser):
+    '''
+        Before this method is called, self.monkeyrunner_result must be set 
+        to the right value
+    '''
+
+
+    def real_parse(self, result_filename=None, output_filename=None,
+           test_name=''):
+        self.pattern = ("^\s*(?P<test_case_id>.*?)\s*="
+                        "\s*(?P<measure_units>.+)\s*$")
+        try:
+            pat = re.compile(self.pattern)
+        except Exception as strerror:
+            raise RuntimeError(("MonkeyrunnerTestParser - Invalid regular"
+                   "  expression '%s'- %s") % (self.pattern, strerror))
+        if not os.path.exists(self.monkeyrunner_result):
+            return
+        with open(self.monkeyrunner_result) as stream:
+            for lineno, line in enumerate(stream, 1):
+                match = pat.search(line)
+                if not match:
+                    continue
+                data = match.groupdict()
+                data["log_filename"] = result_filename
+                data["log_lineno"] = lineno
+                if data.get('result') is None:
+                    data['result'] = 'pass'
+                measure_units = data["measure_units"].strip().split()
+                data["measurement"] = measure_units[0]
+                if len(measure_units) >= 2:
+                    data['units'] = measure_units[1]
+                del(data["measure_units"])
+                self.results['test_results'].append(data)
+
+
 class parse(AndroidResultsCommand):
     """
     Parse the results of previous test that run on the specified device