Change the path of qualified DBs in factory tests.

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
@@ skipping 92 matching lines @@
             if present:
                 self._system[cid] = [ device ]
                 return
 
         self._failures[cid] = [ 'No match' ]
 
 
     def check_existence_key_recovery(self, part_id):
         current_key = self._gbb.get_recoverykey()
         target_key = utils.read_file(part_id)
-        return current_key == target_key
+        return current_key.startswith(target_key)
 
 
     def check_existence_key_root(self, part_id):
         current_key = self._gbb.get_rootkey()
         target_key = utils.read_file(part_id)
-        return current_key == target_key
+        return current_key.startswith(target_key)
 
 
     def check_existence_part_id_chrontel(self, part_id):
         if part_id == self._not_present:
             return True
 
         if part_id == 'ch7036':
             grep_cmd = 'grep i2c_dev /proc/modules'
             i2c_loaded = (utils.system(grep_cmd, ignore_status=True) == 0)
             if not i2c_loaded:
@@ skipping 194 matching lines @@
 
     def run_once(self, approved_dbs='approved_components', ignored_cids=[],
             shared_dict={}):
         self._ignored = ignored_cids
         only_cardreader_failed = False
         all_failures = 'The following components are not matched.\n'
         os.chdir(self.bindir)
 
         # If found the HwQual ID in shared_dict, use the list with the same ID.
         if 'part_id_hwqual' in shared_dict:
-            id = shared_dict['part_id_hwqual']
-            id = id.rpartition(' ')[0].replace(' ', '_')
-            approved_dbs = 'qualified_components*%s' % id
+            id = shared_dict['part_id_hwqual'].replace(' ', '_')
+            approved_dbs = 'data_*/components_%s' % id
 
         # approved_dbs supports shell-like filename expansion.
-        for db in glob.iglob(approved_dbs):
+        existing_dbs = glob.glob(approved_dbs)
+        if not existing_dbs:
+            raise error.TestError('Unable to find approved db: %s' %
+                                  approved_dbs)
+
+        for db in existing_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, 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:
@@ skipping 17 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)