Merge lp:~roadmr/checkbox/1337270-mediacard-ssd into lp:checkbox

[Daniel Manrique]

checkbox-support:parsers:udevadm: Refine media card heuristics.

Per https://bugs.launchpad.net/checkbox-support/+bug/1337270, some SSD
hard drives have model names which made our card reader regular
expression mistake them for card readers (specifically the string mSATA
looked like a memory stick to our naive regex). This adds a simple
negative lookahead to ensure MS only matches if it's not followed
immediately by "ata". The regex is case-insensitive.

checkbox-support:parsers:udevadm: Refine media card heuristics.

Per https://bugs.launchpad.net/checkbox-support/+bug/1337270, some SSD
hard drives have model names which made our card reader regular
expression mistake them for card readers (specifically the string mSATA
looked like a memory stick to our naive regex). This adds a simple
negative lookahead to ensure MS only matches if it's not followed
immediately by "ata". The regex is case-insensitive.

I ran all the checkbox-support tests to ensure nothing else in device detection changed.

[Zygmunt Krynicki (zyga)]

very cool regexp, thanks +1a

review: Approve

=== modified file 'checkbox-support/checkbox_support/parsers/udevadm.py'
--- checkbox-support/checkbox_support/parsers/udevadm.py	2014-06-19 19:00:36 +0000
+++ checkbox-support/checkbox_support/parsers/udevadm.py	2014-07-03 19:44:37 +0000
@@ -81,7 +81,7 @@
     r"N(?P<name>.*?)"
     r"T(?P<type>.*?)"
     r"C(?P<compatible>.*?)")
-CARD_READER_RE = re.compile(r"SD|MMC|CF|MS|SM|xD|Card", re.I)
+CARD_READER_RE = re.compile(r"SD|MMC|CF|MS(?!ata)|SM|xD|Card", re.I)
 GENERIC_RE = re.compile(r"Generic", re.I)
 FLASH_RE = re.compile(r"Flash", re.I)
 FLASH_DISK_RE = re.compile(r"Mass|Storage|Disk", re.I)