Make data_display_geometry as a check item in hardware component test.

client/site_tests/hardware_Components/hardware_Components.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import glob, hashlib, logging, os, pprint, re, sys
 from autotest_lib.client.bin import factory
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib import flashrom_util
 from autotest_lib.client.common_lib import gbb_util
 from autotest_lib.client.common_lib import site_vblock
 
 
 class hardware_Components(test.test):
     version = 1
     _cids = [
+        'data_display_geometry',
         'hash_ro_firmware',
         'part_id_audio_codec',
         'part_id_cpu',
         'part_id_display_panel',
         'part_id_embedded_controller',
         'part_id_ethernet',
         'part_id_flash_chip',
         'part_id_hwqual',
         'part_id_storage',
         'part_id_wireless',
@@ skipping 12 matching lines @@
         'part_id_3g',
         'part_id_gps',
     ]
     _check_existence_cids = [
         'key_recovery',
         'key_root',
         'part_id_chrontel',
     ]
     _non_check_cids = [
         'data_bitmap_fv',
-        'data_display_geometry',
         'data_recovery_url',
     ]
     _not_present = 'Not Present'
 
 
-    def check_component(self, comp_key, comp_id):
+    def check_component(self, comp_key, comp_ids):
         if comp_key in self._ignored:
             return
 
-        self._system[comp_key] = [ comp_id ]
+        if not isinstance(comp_ids, list):
+            comp_ids = [ comp_ids ]
+        self._system[comp_key] = comp_ids
 
         if not self._approved.has_key(comp_key):
             raise error.TestFail('%s missing from database' % comp_key)
 
         app_cids = self._approved[comp_key]
 
         if '*' in app_cids:
             return
 
-        if not comp_id in app_cids:
-            self._failures[comp_key] = [ comp_id ]
+        for comp_id in comp_ids:
+            if not comp_id in app_cids:
+                if comp_key in self._failures:
+                    self._failures[comp_key].append(comp_id)
+                else:
+                    self._failures[comp_key] = [ comp_id ]
 
 
     def check_approved_part_id_existence(self, cid, type):
         """
         Check if there are matching devices on the system.
         Parameter type should be one of 'pci', 'usb', or 'others'.
         """
         if cid in self._ignored:
             return
 
@@ skipping 51 matching lines @@
             probe_cmd = 'ch7036_monitor -p'
             present = (utils.system(probe_cmd, ignore_status=True) == 0)
 
             if not i2c_loaded:
                 utils.system('modprobe -r i2c_dev')
             return present
 
         return False
 
 
+    def get_data_display_geometry(self):
+        cmd = ('get-edid | parse-edid | grep "Mode " | '
+               'sed \'s/^.*"\(.*\)".*$/\\1/\'')
+        data = utils.system_output(cmd).split()
+        if not data:
+            data = [ '' ]
+        return data
+
+
     def get_part_id_audio_codec(self):
         cmd = 'grep -R Codec: /proc/asound/* | head -n 1 | sed s/.\*Codec://'
         part_id = utils.system_output(cmd).strip()
         return part_id
 
 
     def get_part_id_cpu(self):
         cmd = 'grep -m 1 \'model name\' /proc/cpuinfo | sed s/.\*://'
         part_id = utils.system_output(cmd).strip()
         return part_id
@@ skipping 223 matching lines @@
                 cids_need_to_be_record = ['part_id_hwqual']
                 for cid in cids_need_to_be_record:
                     factory.log_shared_data(cid, self._approved[cid][0])
                 return
 
         if only_cardreader_failed:
             all_failures = ('You may forget to insert an SD card.\n' +
                             all_failures)
 
         raise error.TestFail(all_failures)