Skip to content

Commit 59b7909

Browse files
theotherjimmytheotherjimmy
authored
Merge pull request #387 from bridadan/allow_colons_in_product_name
Allow colons in product name
2 parents ae84997 + 4afbfed commit 59b7909

File tree

2 files changed

+27
-8
lines changed

2 files changed

+27
-8
lines changed

‎mbed_lstools/linux.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def __init__(self, **kwargs):
4444
"""
4545
MbedLsToolsBase.__init__(self, **kwargs)
4646
self.nlp = re.compile(
47-
r'(pci|usb)-[0-9a-zA-Z_-]*_(?P<usbid>[0-9a-zA-Z]*)-.*$')
47+
r'(pci|usb)-[0-9a-zA-Z:_-]*_(?P<usbid>[0-9a-zA-Z]*)-.*$')
4848
self.mmp = re.compile(
4949
r'(?P<dev>(/[^/ ]*)+) on (?P<dir>(/[^/ ]*)+) ')
5050
self.udp = re.compile(r'^[0-9]+-[0-9]+[^:\s]*$')

‎test/os_linux_generic.py‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,24 @@ def do_abspath(dir):
126126
'usb-MBED_VFS_0240000028884e45001f700f6bf000118021000097969900-0:0',
127127
'usb-MBED_VFS_0240000028884e450036700f6bf000118021000097969900-0:0',
128128
'usb-MBED_VFS_0240000029164e45001b0012706e000df301000097969900-0:0',
129-
'usb-MBED_VFS_0240000029164e45002f0012706e0006f301000097969900-0:0'
129+
'usb-MBED_VFS_0240000029164e45002f0012706e0006f301000097969900-0:0',
130+
'usb-MBED_VFS_9900000031864e45000a100e0000003c0000000097969901-0:0'
130131
],
131132
'/dev/serial/by-id': [
132133
'usb-ARM_DAPLink_CMSIS-DAP_0240000028634e4500135006691700105f21000097969900-if01',
133134
'usb-ARM_DAPLink_CMSIS-DAP_0240000028884e450018700f6bf000338021000097969900-if01',
134135
'usb-ARM_DAPLink_CMSIS-DAP_0240000028884e450036700f6bf000118021000097969900-if01',
135-
'usb-ARM_DAPLink_CMSIS-DAP_0240000029164e45001b0012706e000df301000097969900-if01'
136+
'usb-ARM_DAPLink_CMSIS-DAP_0240000029164e45001b0012706e000df301000097969900-if01',
137+
'usb-ARM_BBC_micro:bit_CMSIS-DAP_9900000031864e45000a100e0000003c0000000097969901-if01'
136138
],
137139
'/sys/class/block': [
138140
'sdb',
139141
'sdc',
140142
'sdd',
141143
'sde',
142144
'sdf',
143-
'sdg'
145+
'sdg',
146+
'sdh',
144147
],
145148
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-1/1-1.2/1-1.2.6': [
146149
'idVendor',
@@ -165,6 +168,10 @@ def do_abspath(dir):
165168
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-7': [
166169
'idVendor',
167170
'idProduct'
171+
],
172+
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-8': [
173+
'idVendor',
174+
'idProduct'
168175
]
169176
}
170177

@@ -180,7 +187,9 @@ def do_abspath(dir):
180187
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-6/idVendor': '0d28\n',
181188
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-6/idProduct': '0204\n',
182189
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-7/idVendor': '0d28\n',
183-
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-7/idProduct': '0204\n'
190+
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-7/idProduct': '0204\n',
191+
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-8/idVendor': '0d28\n',
192+
'/sys/class/block/../../devices/pci0000:00/0000:00:06.0/usb1/1-8/idProduct': '0204\n'
184193
}
185194

186195
link_dict_rpi = {
@@ -190,16 +199,19 @@ def do_abspath(dir):
190199
'/dev/disk/by-id/usb-MBED_VFS_0240000028884e450036700f6bf000118021000097969900-0:0': '../../sde',
191200
'/dev/disk/by-id/usb-MBED_VFS_0240000029164e45001b0012706e000df301000097969900-0:0': '../../sdf',
192201
'/dev/disk/by-id/usb-MBED_VFS_0240000029164e45002f0012706e0006f301000097969900-0:0': '../../sdg',
202+
'/dev/disk/by-id/usb-MBED_VFS_9900000031864e45000a100e0000003c0000000097969901-0:0': '../../sdh',
193203
'/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000028634e4500135006691700105f21000097969900-if01': '../../ttyACM0',
194204
'/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000028884e450018700f6bf000338021000097969900-if01': '../../ttyACM1',
195205
'/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000028884e450036700f6bf000118021000097969900-if01': '../../ttyACM3',
196206
'/dev/serial/by-id/usb-ARM_DAPLink_CMSIS-DAP_0240000029164e45001b0012706e000df301000097969900-if01': '../../ttyACM2',
207+
'/dev/serial/by-id/usb-ARM_BBC_micro:bit_CMSIS-DAP_9900000031864e45000a100e0000003c0000000097969901-if01': '../../ttyACM4',
197208
'/sys/class/block/sdb': '../../devices/pci0000:00/0000:00:06.0/usb1/1-1/1-1.2/1-1.2.6/1-1.2.6:1.0/host8568/target8568:0:0/8568:0:0:0/block/sdb',
198209
'/sys/class/block/sdc': '../../devices/pci0000:00/0000:00:06.0/usb1/1-3/1-3:1.0/host4/target4:0:0/4:0:0:0/block/sdc',
199210
'/sys/class/block/sdd': '../../devices/pci0000:00/0000:00:06.0/usb1/1-4/1-4:1.0/host5/target5:0:0/5:0:0:0/block/sdd',
200211
'/sys/class/block/sde': '../../devices/pci0000:00/0000:00:06.0/usb1/1-5/1-5:1.0/host6/target6:0:0/6:0:0:0/block/sde',
201212
'/sys/class/block/sdf': '../../devices/pci0000:00/0000:00:06.0/usb1/1-6/1-6:1.0/host7/target7:0:0/7:0:0:0/block/sdf',
202-
'/sys/class/block/sdg': '../../devices/pci0000:00/0000:00:06.0/usb1/1-7/1-7:1.0/host8/target8:0:0/8:0:0:0/block/sdg'
213+
'/sys/class/block/sdg': '../../devices/pci0000:00/0000:00:06.0/usb1/1-7/1-7:1.0/host8/target8:0:0/8:0:0:0/block/sdg',
214+
'/sys/class/block/sdh': '../../devices/pci0000:00/0000:00:06.0/usb1/1-8/1-7:1.0/host9/target9:0:0/9:0:0:0/block/sdh'
203215
}
204216

205217
mount_list_rpi = [
@@ -208,7 +220,8 @@ def do_abspath(dir):
208220
b'/dev/sdd on /media/usb2 type vfat (rw,noexec,nodev,sync,noatime,nodiratime,gid=1000,uid=1000,dmask=000,fmask=000)',
209221
b'/dev/sde on /media/usb3 type vfat (rw,noexec,nodev,sync,noatime,nodiratime,gid=1000,uid=1000,dmask=000,fmask=000)',
210222
b'/dev/sdf on /media/usb4 type vfat (rw,noexec,nodev,sync,noatime,nodiratime,gid=1000,uid=1000,dmask=000,fmask=000)',
211-
b'/dev/sdg on /media/usb5 type vfat (rw,noexec,nodev,sync,noatime,nodiratime,gid=1000,uid=1000,dmask=000,fmask=000)'
223+
b'/dev/sdg on /media/usb5 type vfat (rw,noexec,nodev,sync,noatime,nodiratime,gid=1000,uid=1000,dmask=000,fmask=000)',
224+
b'/dev/sdh on /media/usb6 type vfat (rw,noexec,nodev,sync,noatime,nodiratime,gid=1000,uid=1000,dmask=000,fmask=000)'
212225
]
213226
def test_get_detected_rpi(self):
214227
mbed_det = self.find_candidates_with_patch(
@@ -235,14 +248,20 @@ def test_get_detected_rpi(self):
235248
'vendor_id': '0d28',
236249
'product_id': '0204'
237250
}, mbed_det)
238-
239251
self.assertIn({
240252
'mount_point': '/media/usb3',
241253
'serial_port': '/dev/ttyACM3',
242254
'target_id_usb_id': '0240000028884e450036700f6bf000118021000097969900',
243255
'vendor_id': '0d28',
244256
'product_id': '0204'
245257
}, mbed_det)
258+
self.assertIn({
259+
'mount_point': '/media/usb6',
260+
'serial_port': '/dev/ttyACM4',
261+
'target_id_usb_id': '9900000031864e45000a100e0000003c0000000097969901',
262+
'vendor_id': '0d28',
263+
'product_id': '0204'
264+
}, mbed_det)
246265

247266

248267
listdir_dict_1 = {

0 commit comments

Comments
 (0)