commit 2b238977ef2afa8f6cb06f72ddd9e4df2971931b
author henryhsu <henryhsu@chromium.org> Wed Nov 20 10:02:34 2013
committer Heng-ruey Hsu <henryhsu@chromium.org> Thu Nov 21 07:05:28 2013
tree 39c6346fdc6564d9cacc355f456d20e767a51c02
parent 3cd5a998124d4095239182cb8a3b012c4013724a

Fix removable storage detect mmcblk error

When we execute removable storage test case and plug USB storage disk,
we will get SD device type becuase the driver attribute is SD.

If we insert SD card, the attribute string should not inlucde 'usb'.
Therefore, we can filter the result.
Ex:
Insert usb mass storage, the attribute string is like
'usb jetflash/usb-storage/sd 16gb jetflash'
Insert sd card, the attribute string is 'mmcblk'

BUG=chrome-os-partner:23865
TEST=manually test, pass removable storage test case with/without SD
card

Change-Id: I9b6cc764bf52ed129330545f0c6d0cbc74ad4757
Reviewed-on: https://chromium-review.googlesource.com/177335
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Commit-Queue: Heng-ruey Hsu <henryhsu@chromium.org>
Tested-by: Heng-ruey Hsu <henryhsu@chromium.org>

py/test/pytests/removable_storage.py

diff --git a/py/test/pytests/removable_storage.py b/py/test/pytests/removable_storage.py
index 5e62ac2..28969cf 100644
--- a/py/test/pytests/removable_storage.py
+++ b/py/test/pytests/removable_storage.py
@@ -181,6 +181,8 @@
     if device.device_node.find(_UDEV_MMCBLK_PATH) == 0:
       return True
     attr_str = self.GetAttrs(device, set(_CARD_READER_ATTRS)).lower()
+    if 'usb' in attr_str:
+      return False
     for desc in _CARD_READER_DESCS:
       if desc in attr_str:
         return True