Merge lp:~liuyq0307/lava-android-test/vellamo-fail-pattern into lp:lava-android-test

[Yongqin Liu]

add the process for the fail pattern of vellamo test

[Andy Doan (doanac)]

review: Approve

=== modified file 'lava_android_test/commands.py'
--- lava_android_test/commands.py	2012-08-23 06:01:27 +0000
+++ lava_android_test/commands.py	2012-10-15 16:53:20 +0000
@@ -669,28 +669,35 @@
 
     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*$")
-
-        pat = re.compile(self.pattern)
+        self.res_pattern = ("^\s*(?P<test_case_id>.*?)\s*="
+                        "\s*(?P<result>(true|false))\s*$")
+        self.measurement_pattern = ("^\s*(?P<test_case_id>.*?)\s*="
+                        "\s*(?P<measurement>[\.\d]+)\s*$")
+        self.measurement_units_pattern = ("^\s*(?P<test_case_id>.*?)\s*="
+                        "\s*(?P<measurement>[\.\d]+)\s+(?P<units>\S+)\s*$")
+
+        res_pat = re.compile(self.res_pattern)
+        measurement_pat = re.compile(self.measurement_pattern)
+        measurement_units_pat = re.compile(self.measurement_units_pattern)
+
 
         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)
+                match = res_pat.search(line)
                 if not match:
-                    continue
+                    match = measurement_pat.search(line)
+                    if not match:
+                        match = measurement_units_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)