Merge lp:~liuyq0307/lava-android-test/fix-ppm-url into lp:lava-android-test

[Yongqin Liu]

updated the url of ppm file to the following url:
http://testdata.validation.linaro.org/tjbench/nightshot_iso_100.ppm

[Yongqin Liu (liuyq0307)]

tested

review: Approve

[Fathi Boudra (fboudra)]

we don't have a policy on the paths to use. I replied on the mailing list

[Yongqin Liu (liuyq0307)]

sorry, saw the mail after merged.
Have overwritten with version 151 now.

Will update and merge after decided

[Andy Doan (doanac)]

let's hold off on the merge until the naming scheme for files is settled on the mailing list.

review: Needs Fixing

[lp:~liuyq0307/lava-android-test/fix-ppm-url]

154. By Yongqin Liu on 2012-06-06

merge with trunk

=== modified file 'lava_android_test/test_definitions/tjbench.py'
--- lava_android_test/test_definitions/tjbench.py	2012-04-18 14:22:26 +0000
+++ lava_android_test/test_definitions/tjbench.py	2012-06-06 09:26:18 +0000
@@ -26,8 +26,8 @@
 config = get_config()
 curdir = os.path.realpath(os.path.dirname(__file__))
 ppm_file_name = 'nightshot_iso_100.ppm'
-ppm_url = ("https://wiki.linaro.org/TestDataLinkPage?action=AttachFile&"
-           "do=get&target=nightshot_iso_100.ppm")
+ppm_url = ("http://testdata.validation.linaro.org/tjbench/"
+           "nightshot_iso_100.ppm")
 ppm_temp_path = os.path.join(config.tempdir_host, ppm_file_name)
 ppm_android_path = os.path.join(config.tempdir_android, test_name,
                                 ppm_file_name)
@@ -81,30 +81,30 @@
                 match = measure_pat.search(line)
                 if match:
                     tmpdata = match.groupdict()
-                    test_case_preffix = '%s_%s_%s' % (tmpdata['format'],
+                    test_case_prefix = '%s_%s_%s' % (tmpdata['format'],
                                           tmpdata['subsamp'],
                                           tmpdata['qual'])
-                    if not prefix_hash.get(test_case_preffix):
-                        prefix_hash[test_case_preffix] = True
-                        test_case_preffix = '%s_%s' % (test_case_preffix,
+                    if not prefix_hash.get(test_case_prefix):
+                        prefix_hash[test_case_prefix] = True
+                        test_case_prefix = '%s_%s' % (test_case_prefix,
                                                       'scale_half')
                     common_data = {'log_filename': result_filename,
                                    'log_lineno': lineno,
                                    'result': 'pass'
                                    }
-                    comp_perf = {'test_case_id': '%s_%s' % (test_case_preffix,
+                    comp_perf = {'test_case_id': '%s_%s' % (test_case_prefix,
                                                             'comp_perf'),
                                  'units': units,
                                  'measurement': tmpdata['comp_perf']
                                  }
                     comp_perf.update(common_data)
-                    comp_ratio = {'test_case_id': '%s_%s' % (test_case_preffix,
+                    comp_ratio = {'test_case_id': '%s_%s' % (test_case_prefix,
                                                              'comp_ratio'),
                                  'units': '%',
                                  'measurement': tmpdata['comp_ratio']
                                  }
                     comp_ratio.update(common_data)
-                    dcomp_perf = {'test_case_id': '%s_%s' % (test_case_preffix,
+                    dcomp_perf = {'test_case_id': '%s_%s' % (test_case_prefix,
                                                              'dcomp_perf'),
                                  'units': units,
                                  'measurement': tmpdata['dcomp_perf']