Add memory size check

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 firmware_hash
 import glob
 import logging
 import os
 import pprint
 import re
@@ skipping 14 matching lines @@
     #  - USB: USB devices;
     #  - probable: returns existed or not by given some pre-defined choices;
     #  - not test: only data, don't test them.
     _enumerable_cids = [
         'data_display_geometry',
         'hash_ec_firmware',
         'hash_ro_firmware',
         'part_id_audio_codec',
         'part_id_cpu',
         'part_id_display_panel',
+        'part_id_dram',
         'part_id_embedded_controller',
         'part_id_ethernet',
         'part_id_flash_chip',
         'part_id_ec_flash_chip',
         'part_id_hwqual',
         'part_id_storage',
         'part_id_tpm',
         'part_id_wireless',
         'vendor_id_touchpad',
         'version_rw_firmware',
@@ skipping 162 matching lines @@
         vendor_file = '/sys/class/net/eth0/device/vendor'
         part_file = '/sys/class/net/eth0/device/device'
         if os.path.exists(part_file) and os.path.exists(vendor_file):
             vendor_id = utils.read_one_line(vendor_file).replace('0x', '')
             part_id = utils.read_one_line(part_file).replace('0x', '')
             return "%s:%s" % (vendor_id, part_id)
         else:
             return self._not_present
 
 
+    def get_part_id_dram(self):
+        grep_cmd = 'grep i2c_dev /proc/modules'
+        i2c_loaded = (utils.system(grep_cmd, ignore_status=True) == 0)
+        if not i2c_loaded:
+            utils.system('modprobe -r i2c_dev')
+        cmd = ('mosys -l memory spd print geometry | '
+               'grep size_mb | cut -f2 -d"|"')
+        part_id = utils.system_output(cmd).strip()
+        if part_id != '':
+            return part_id
+        else:
+            return self._not_present
+
+
     def get_part_id_flash_chip(self):
         # example output:
         #  Found chip "Winbond W25x16" (2048 KB, FWH) at physical address 0xfe
         parts = []
         lines = utils.system_output('flashrom -V -p internal:bus=spi',
                                     ignore_status=True).split('\n')
         for line in lines:
             match = re.search(r'Found chip "(.*)" .* at physical address ',
                               line)
             if match:
                 parts.append(match.group(1))
         part_id = ", ".join(parts)
         return part_id
 

[Tammo Spalink, 2011/03/11 07:59:58]

while you are fixing ws -- how about adding one here

[Nick Sanders, 2011/03/11 09:40:57]

Done.

     def get_part_id_ec_flash_chip(self):
         # example output:
         #  Found chip "Winbond W25x10" (128 KB, SPI) at physical address ...
         parts = []
         # Undo BBS register after call.
         lines = utils.system_output('flashrom -V -p internal:bus=lpc; '
                                     'flashrom -p internal:bus=spi',
                                     ignore_status=True).split('\n')
         for line in lines:
             match = re.search(r'Found chip "(.*)" .* at physical address ',
                               line)
             if match:
                 parts.append(match.group(1))
         part_id = ", ".join(parts)
         return part_id
 

[Tammo Spalink, 2011/03/11 07:59:58]

and here

[Nick Sanders, 2011/03/11 09:40:57]

Done.

     def get_part_id_hwqual(self):
         hwid_file = '/sys/devices/platform/chromeos_acpi/HWID'
         if os.path.exists(hwid_file):
             part_id = utils.read_one_line(hwid_file)
             return part_id
         else:
             return self._not_present
 

[Tammo Spalink, 2011/03/11 07:59:58]

and keeping this :)

[Nick Sanders, 2011/03/11 09:40:57]

Done.

-
     def get_part_id_storage(self):
         cmd = ('cd $(find /sys/devices -name sda)/../..; '
                'cat vendor model | tr "\n" " " | sed "s/ \+/ /g"')
         part_id = utils.system_output(cmd).strip()
         return part_id
 
 
     def get_part_id_tpm(self):
         """
         Returns Manufacturer_info : Chip_Version
@@ skipping 36 matching lines @@
                 data = utils.system_output(detect_program, ignore_status=True)
                 properties = dict(map(str.strip, line.split('=', 1))
                                   for line in data.splitlines() if '=' in line)
                 model = properties.get(model_string_str, 'UnknownModel')
                 firmware_id = properties.get(firmware_id_str, 'UnknownFWID')
                 # The pattern " on xxx Port" may vary by the detection approach,
                 # so we need to strip it.
                 model = re.sub(' on [^ ]* [Pp]ort$', '', model)
                 # Format: Model #FirmwareId
                 part_id = '%s #%s' % (model, firmware_id)
+

[Tammo Spalink, 2011/03/11 07:59:58]

did you mean to add this?

[Nick Sanders, 2011/03/11 09:40:57]

Done.

         return part_id
 
 
     def get_vendor_id_touchpad(self):
         # First, try to use closed-source method to probe touch pad
         part_id = self.get_closed_vendor_id_touchpad('Synaptics')
         if part_id != '':
             return part_id
         # If the closed-source method above fails to find vendor infomation,
         # try an open-source method.
@@ skipping 110 matching lines @@
             else:
                 raise error.TestError('The ignored cid %s is not defined' % cid)
             self._not_test_cids.append(cid)
 
 
     def read_approved_from_file(self, filename):
         approved = eval(utils.read_file(filename))
         for group in self._to_be_tested_cids_groups + [ self._not_test_cids ]:
             for cid in group:
                 if cid not in approved:
-                    raise error.TestFail('%s missing from database' % cid)
+                    # If we don't have any listing for this type of part in HWID,

[Tammo Spalink, 2011/03/11 07:59:58]

exceeded 80 cols here

[Nick Sanders, 2011/03/11 09:40:57]

Done.

+                    # it's not required.
+                    factory.log('Bypassing unlisted cid %s' % cid)
+                    approved[cid] = '*'
         return approved
 
 
     def select_correct_dbs(self, approved_dbs):
         os.chdir(self.bindir)
         id_hwqual = None
         try:
             id_hwqual = factory.get_shared_data('part_id_hwqual')
         except Exception, e:
             # hardware_Components may run without factory environment
@@ skipping 73 matching lines @@
                     # hardware_Components may run without factory environment
                     factory.log('Failed setting shared data, ignored: %s' %
                                 repr(e))
                 return
 
         if only_cardreader_failed:
             all_failures = ('You may forget to insert an SD card.\n' +
                             all_failures)
 
         raise error.TestFail(all_failures)