@@ -28,42 +28,60 @@ class MbedLsToolsMock():
28
28
def __init__ (self , test_type ):
29
29
self .interface_test_type = test_type
30
30
31
- def get_details_txt (self , mount_point ):
32
- return self .details_txt_types [self .interface_test_type ];
31
+ def list_mbeds (self , unique_names = False , read_details_txt = False ):
32
+ return self .mbed_types [self .interface_test_type ];
33
33
34
34
# Static details.txt types.
35
- details_txt_types = {
36
- 'details_valid_interface_version' : {
37
- 'Unique ID' : '0226000029164e45002f0012706e0006f301000097969900' ,
38
- 'HIF ID' : '97969900' ,
39
- 'Auto Reset' : '0' ,
40
- 'Automation allowed' : '0' ,
41
- 'Daplink Mode' : 'Interface' ,
42
- 'Interface Version' : '0240' ,
43
- 'Git SHA' : 'c765cbb590f57598756683254ca38b211693ae5e' ,
44
- 'Local Mods' : '0' ,
45
- 'USB Interfaces' : 'MSD, CDC, HID' ,
46
- 'Interface CRC' : '0x26764ebf'
47
- },
48
- 'details_valid_version' : {
49
- 'Version' : '0226' ,
50
- 'Build' : 'Aug 24 2015 17:06:30' ,
51
- 'Git Commit SHA' : '27a236b9fe39c674a703c5c89655fbd26b8e27e1' ,
52
- 'Git Local mods' : 'Yes'
53
- },
54
- 'details_missing_interface_version' : {
55
- 'Unique ID' : '0226000033514e450044500585d4001de981000097969900' ,
56
- 'HIC ID' : '97969900' ,
57
- 'Auto Reset' : '0' ,
58
- 'Automation allowed' : '0' ,
59
- 'Overflow detection' : '0' ,
60
- 'Daplink Mode' : 'Interface' ,
61
- 'Git SHA' : 'b403a07e3696cee1e116d44cbdd64446e056ce38' ,
62
- 'Local Mods' : '0' ,
63
- 'USB Interfaces' : 'MSD, CDC, HID' ,
64
- 'Interface CRC' : '0x4d98bf7e' ,
65
- 'Remount count' : '0'
66
- },
35
+ mbed_types = {
36
+ 'details_valid_interface_version' : [{
37
+ 'daplink_hic_id' : u'97969900' ,
38
+ 'daplink_version' : u'0244' ,
39
+ 'target_id' : u'0240000034544e45001500048e41001b8321000097969900' ,
40
+ 'serial_port' : u'COM3' ,
41
+ 'target_id_usb_id' : u'0240000034544e45001500048e41001b8321000097969900' ,
42
+ 'daplink_auto_reset' : u'0' ,
43
+ 'daplink_git_sha' : u'392f85aa88a41125dec0b963ce73c6795b8bdd0d' ,
44
+ 'daplink_interface_version' : u'0244' ,
45
+ 'daplink_overflow_detection' : u'0' ,
46
+ 'daplink_daplink_mode' : u'Interface' ,
47
+ 'target_id_mbed_htm' : u'0240000034544e45001500048e41001b8321000097969900' ,
48
+ 'mount_point' : 'D:' ,
49
+ 'daplink_automation_allowed' : u'0' ,
50
+ 'daplink_interface_crc' : u'0xc525d856' ,
51
+ 'daplink_local_mods' : u'0' ,
52
+ 'daplink_unique_id' : u'0240000034544e45001500048e41001b8321000097969900' ,
53
+ 'daplink_remount_count' : u'0' ,
54
+ 'daplink_bootloader_crc' : u'0xc4ebf65c' ,
55
+ 'platform_name' : u'K64F' ,
56
+ 'platform_name_unique' : u'K64F[0]' ,
57
+ 'daplink_bootloader_version' : u'0244' ,
58
+ 'daplink_usb_interfaces' : u'MSD, CDC, HID'
59
+
60
+ }],
61
+ 'details_missing_interface_version' : [{
62
+ 'daplink_hic_id' : u'97969900' ,
63
+ 'target_id' : u'0240000034544e45001500048e41001b8321000097969900' ,
64
+ 'serial_port' : u'COM3' ,
65
+ 'target_id_usb_id' : u'0240000034544e45001500048e41001b8321000097969900' ,
66
+ 'daplink_auto_reset' : u'0' ,
67
+ 'daplink_git_sha' : u'392f85aa88a41125dec0b963ce73c6795b8bdd0d' ,
68
+ 'daplink_interface_version' : u'0244' ,
69
+ 'daplink_overflow_detection' : u'0' ,
70
+ 'daplink_daplink_mode' : u'Interface' ,
71
+ 'target_id_mbed_htm' : u'0240000034544e45001500048e41001b8321000097969900' ,
72
+ 'mount_point' : 'D:' ,
73
+ 'daplink_automation_allowed' : u'0' ,
74
+ 'daplink_interface_crc' : u'0xc525d856' ,
75
+ 'daplink_local_mods' : u'0' ,
76
+ 'daplink_unique_id' : u'0240000034544e45001500048e41001b8321000097969900' ,
77
+ 'daplink_remount_count' : u'0' ,
78
+ 'daplink_bootloader_crc' : u'0xc4ebf65c' ,
79
+ 'platform_name' : u'K64F' ,
80
+ 'platform_name_unique' : u'K64F[0]' ,
81
+ 'daplink_bootloader_version' : u'0244' ,
82
+ 'daplink_usb_interfaces' : u'MSD, CDC, HID'
83
+
84
+ }],
67
85
'details_invalid_none' : None
68
86
}
69
87
@@ -84,6 +102,7 @@ def setUp(self):
84
102
"""
85
103
self .missing_mount_point = None
86
104
self .mount_point = "D:"
105
+ self .invalid_mount_point = "F:"
87
106
88
107
def tearDown (self ):
89
108
"""
@@ -102,21 +121,9 @@ def test_interface_version_valid(self, mbed_lstools_mock):
102
121
:param mbed_lstools_mock: Mocks Mbed LS tools with MbedLsToolsMock
103
122
:return
104
123
"""
105
-
106
- interface_version = get_interface_version (self .mount_point )
107
- assert interface_version == '0240'
108
124
109
- @patch ("mbed_lstools.create" , return_value = MbedLsToolsMock ('details_valid_version' ))
110
- def test_version_valid (self , mbed_lstools_mock ):
111
- """
112
- Test that checks function returns correctly when given a valid Version
113
-
114
- :param mbed_lstools_mock: Mocks Mbed LS tools with MbedLsToolsMock
115
- :return
116
- """
117
-
118
125
interface_version = get_interface_version (self .mount_point )
119
- assert interface_version == '0226 '
126
+ assert interface_version == '0244 '
120
127
121
128
@patch ("mbed_lstools.create" , return_value = MbedLsToolsMock ('details_missing_interface_version' ))
122
129
def test_interface_version_missing_interface_version (self , mbed_lstools_mock ):
@@ -143,7 +150,19 @@ def test_version_none(self, mbed_lstools_mock):
143
150
144
151
interface_version = get_interface_version (self .mount_point )
145
152
assert interface_version == 'unknown'
146
-
153
+
154
+ @patch ("mbed_lstools.create" , return_value = MbedLsToolsMock ('details_valid_interface_version' ))
155
+ def test_interface_version_wrong_mount_point (self , mbed_lstools_mock ):
156
+ """
157
+ Test that checks function returns correctly when there is no board attached to supplied mount point.
158
+
159
+ :param mbed_lstools_mock: Mocks Mbed LS tools with MbedLsToolsMock
160
+ :return
161
+ """
162
+
163
+ interface_version = get_interface_version (self .invalid_mount_point )
164
+ assert interface_version == 'unknown'
165
+
147
166
@patch ("mbed_lstools.create" , return_value = MbedLsToolsMock ('details_invalid_none' ))
148
167
def test_interface_version_missing_mount_point (self , mbed_lstools_mock ):
149
168
"""
0 commit comments