remove all references to weightedDiffMeasure from cluster_telemetry code

cluster_telemetry/telemetry_master_scripts/json_summary_combiner_test.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tests for module json_summary_combiner.py"""
 
 import filecmp
 import os
 import shutil
@@ skipping 27 matching lines @@
         file_count += 1
         self.assertEquals(file_info.file_name,
                           'file%s_%s.png' % (slave_name, file_count))
         self.assertEquals(file_info.skp_location,
                           'http://storage.cloud.google.com/dummy-bucket/skps'
                           '/%s/file%s_.skp' % (slave_name, slave_name))
         self.assertEquals(file_info.num_pixels_differing,
                           int('%s%s1' % (slave_num, file_count)))
         self.assertEquals(file_info.percent_pixels_differing,
                           int('%s%s2' % (slave_num, file_count)))
-        self.assertEquals(file_info.weighted_diff_measure,
-                          int('%s%s3' % (slave_num, file_count)))
         self.assertEquals(file_info.max_diff_per_channel,
                           int('%s%s4' % (slave_num, file_count)))
 
       self.assertEquals(
           slave_info.skps_location,
           'gs://dummy-bucket/skps/%s' % slave_name)
       self.assertEquals(
           slave_info.files_location_nopatch,
           'gs://dummy-bucket/output-dir/%s/nopatch-images' % slave_name)
       self.assertEquals(
@@ skipping 10 matching lines @@
 
   def _get_test_slave_name_to_info(self):
     slave_name_to_info = {
         'slave1': json_summary_combiner.SlaveInfo(
             slave_name='slave1',
             failed_files=[
                 json_summary_combiner.FileInfo(
                     'fileslave1_1.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave1/'
                     'fileslave1_.skp',
-                    111, 112, 113, 114, 115),
+                    111, 112, 114, 115),
                 json_summary_combiner.FileInfo(
                     'fileslave1_2.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave1/'
                     'fileslave1_.skp',
-                    121, 122, 123, 124, 125)],
+                    121, 122, 124, 125)],
             skps_location='gs://dummy-bucket/skps/slave1',
             files_location_diffs='gs://dummy-bucket/slave1/diffs',
             files_location_whitediffs='gs://dummy-bucket/slave1/whitediffs',
             files_location_nopatch='gs://dummy-bucket/slave1/nopatch',
             files_location_withpatch='gs://dummy-bucket/slave1/withpatch'),
         'slave2': json_summary_combiner.SlaveInfo(
             slave_name='slave2',
             failed_files=[
                 json_summary_combiner.FileInfo(
                     'fileslave2_1.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave2/'
                     'fileslave2_.skp',
-                    211, 212, 213, 214, 215)],
+                    211, 212, 214, 215)],
             skps_location='gs://dummy-bucket/skps/slave2',
             files_location_diffs='gs://dummy-bucket/slave2/diffs',
             files_location_whitediffs='gs://dummy-bucket/slave2/whitediffs',
             files_location_nopatch='gs://dummy-bucket/slave2/nopatch',
             files_location_withpatch='gs://dummy-bucket/slave2/withpatch'),
         'slave3': json_summary_combiner.SlaveInfo(
             slave_name='slave3',
             failed_files=[
                 json_summary_combiner.FileInfo(
                     'fileslave3_1.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave3/'
                     'fileslave3_.skp',
-                    311, 312, 313, 314, 315),
+                    311, 312, 314, 315),
                 json_summary_combiner.FileInfo(
                     'fileslave3_2.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave3/'
                     'fileslave3_.skp',
-                    321, 322, 323, 324, 325),
+                    321, 322, 324, 325),
                 json_summary_combiner.FileInfo(
                     'fileslave3_3.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave3/'
                     'fileslave3_.skp',
-                    331, 332, 333, 334, 335),
+                    331, 332, 334, 335),
                 json_summary_combiner.FileInfo(
                     'fileslave3_4.png',
                     'http://storage.cloud.google.com/dummy-bucket/skps/slave3/'
                     'fileslave3_.skp',
-                    341, 342, 343, 344, 345)],
+                    341, 342, 344, 345)],
             skps_location='gs://dummy-bucket/skps/slave3',
             files_location_diffs='gs://dummy-bucket/slave3/diffs',
             files_location_whitediffs='gs://dummy-bucket/slave3/whitediffs',
             files_location_nopatch='gs://dummy-bucket/slave3/nopatch',
             files_location_withpatch='gs://dummy-bucket/slave3/withpatch')
     }
     return slave_name_to_info
 
   def test_OutputToHTML_WithDifferences_WithAbsoluteUrl(self):
     slave_name_to_info = self._get_test_slave_name_to_info()
@@ skipping 48 matching lines @@
 
     html_expected_dir = os.path.join(self._test_data_dir, 'html_outputs',
                                      'nodifferences')
     self.assertTrue(
         filecmp.cmp(os.path.join(html_expected_dir, 'index.html'),
                     os.path.join(self._actual_html_dir, 'index.html')))
 
 
 if __name__ == '__main__':
   unittest.main()
-