Make hardware_Components test work on legacy BIOS

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
+import glob, hashlib, logging, os, pprint, re, sys
 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 site_vblock
 
 
 class hardware_Components(test.test):
     version = 1
     _cids = [
         'hash_ro_firmware',
@@ skipping 260 matching lines @@
             block = site_vblock.unpack_verification_block(data)
             ver = block['VbFirmwarePreambleHeader']['firmware_version']
             versions[index] = ver
         # we embed error reports in return value.
         assert len(versions) == 2
         if versions[0] != versions[1]:
             return 'A=%d, B=%d' % (versions[0], versions[1])
         return '%d' % (versions[0])
 
 
+    def force_get_property(self, property_name):
+        """ Returns property value or empty string on error. """
+        try:
+            return getattr(self, property_name)()
+        except error.TestError as e:
+            logging.error("Test error in getting property %s", property_name,
+                          exc_info=1)
+            return ''
+        except:
+            logging.error("Exception getting property %s", property_name,
+                          exc_info=1)
+            return ''
+
+
     def pformat(self, obj):
         return "\n" + self._pp.pformat(obj) + "\n"
 
 
     def initialize(self):
         self._pp = pprint.PrettyPrinter()
 
 
     def run_once(self, approved_dbs='approved_components', ignored_cids=[]):
         self._ignored = ignored_cids
         all_failures = ''
         os.chdir(self.bindir)
 
         # approved_dbs supports shell-like filename expansion.
         for db in glob.iglob(approved_dbs):
             self._system = {}
             self._failures = {}
 
             if not os.path.exists(db):
                 raise error.TestError('Unable to find approved db: %s' % db)
 
             self._approved = eval(utils.read_file(db))
             logging.debug('Approved DB: %s', self.pformat(self._approved))
 
             for cid in self._cids:
-                self.check_component(cid, getattr(self, 'get_' + cid)())
+                self.check_component(cid, self.force_get_property('get_' + cid))
 
             for cid in self._pci_cids:
                 self.check_approved_part_id_existence(cid, type='pci')
 
             for cid in self._usb_cids:
                 self.check_approved_part_id_existence(cid, type='usb')
 
             for cid in self._check_existence_cids:
                 self.check_approved_part_id_existence(cid, type='others')
 
             logging.debug('System: %s', self.pformat(self._system))
 
             outdb = os.path.join(self.resultsdir, 'system_components')
             utils.open_write_close(outdb, self.pformat(self._system))
 
             if self._failures:
                 all_failures += 'Approved DB: %s' % db
                 all_failures += self.pformat(self._failures)
             else:
                 # If one of DBs is matched, record the hwqual_id and exit.
                 self.write_test_keyval(
                     {'hwqual_id': self._approved['part_id_hwqual'][0]})
                 return
 
         raise error.TestFail(all_failures)