Merge ~kevinyeh/checkbox-support:fix-sd-performance-manual into checkbox-support:master

[Kevin Yeh]

scripts/run_watcher.py

fix can't mount mediacard(mmc, sd, sdhc, etc.) correctly on UC while running *-performance-manual test

[Sylvain Pineau (sylvain-pineau)]

Thanks, make sense to adopt this fix.

For the record, a similar fix was proposed here for mediacard tests on UC:

https://code.launchpad.net/~checkbox-dev/checkbox-support/+git/checkbox-support/+merge/395890

review: Approve

diff --git a/checkbox_support/scripts/run_watcher.py b/checkbox_support/scripts/run_watcher.py
index 7a33b85..36e3d2b 100644
--- a/checkbox_support/scripts/run_watcher.py
+++ b/checkbox_support/scripts/run_watcher.py
@@ -53,7 +53,7 @@ class USBWatcher:
         signal.alarm(self.USB_ACTION_TIMEOUT)
         if self.args.usb_type == "mediacard":
             # Match something like "mmcblk0: p1".
-            self.PART_RE = re.compile("mmcblk\d+: (?P<part_name>p\d+)")
+            self.PART_RE = re.compile("mmcblk(?P<dev_num>\d)+: (?P<part_name>p\d+)")
 
     def run(self):
         j = journal.Reader()
@@ -81,7 +81,10 @@ class USBWatcher:
         # looking for string like "sdb: sdb1"
         match = re.search(self.PART_RE, line_str)
         if match:
-            self.MOUNTED_PARTITION = match.group('part_name')
+            if self.args.usb_type == "mediacard":
+                self.MOUNTED_PARTITION = 'mmcblk'+match.group('dev_num')+match.group('part_name')
+            else:
+                self.MOUNTED_PARTITION = match.group('part_name')
 
     def _refresh_detection(self, line_str):
         """