@@ -215,8 +215,12 @@ def test_process_initlevels(self, mock_zilinit, mock_ip, mock_on):
215
215
216
216
def mock_obj_name (* args ):
217
217
if args [0 ] == (0 , 0 , 0 ):
218
+ return "i0"
219
+ elif args [0 ] == (0 , 1 , 0 ):
218
220
return "__device_dts_ord_11"
219
221
elif args [0 ] == (4 , 0 , 0 ):
222
+ return "i1"
223
+ elif args [0 ] == (4 , 1 , 0 ):
220
224
return "__device_dts_ord_22"
221
225
return f"name_{ args [0 ][0 ]} _{ args [0 ][1 ]} "
222
226
mock_on .side_effect = mock_obj_name
@@ -226,15 +230,14 @@ def mock_obj_name(*args):
226
230
self .assertDictEqual (obj .initlevels , {
227
231
"EARLY" : [],
228
232
"PRE_KERNEL_1" : [],
229
- "PRE_KERNEL_2" : ["a: __device_dts_ord_11" , "b: __device_dts_ord_22" ],
230
- "POST_KERNEL" : ["c: name_8_0" ],
233
+ "PRE_KERNEL_2" : ["a: i0( __device_dts_ord_11) " , "b: i1( __device_dts_ord_22) " ],
234
+ "POST_KERNEL" : ["c: name_8_0(name_8_1) " ],
231
235
"APPLICATION" : [],
232
236
"SMP" : [],
233
237
})
234
-
235
238
self .assertDictEqual (obj .devices , {
236
- 11 : check_init_priorities .Priority ("PRE_KERNEL_2" , 0 ),
237
- 22 : check_init_priorities .Priority ("PRE_KERNEL_2" , 1 ),
239
+ 11 : ( check_init_priorities .Priority ("PRE_KERNEL_2" , 0 ), "i0" ),
240
+ 22 : ( check_init_priorities .Priority ("PRE_KERNEL_2" , 1 ), "i1" ),
238
241
})
239
242
240
243
class testValidator (unittest .TestCase ):
@@ -300,14 +303,14 @@ def test_check(self, mock_vinit):
300
303
validator ._ord2node [2 ]._binding = None
301
304
validator ._ord2node [2 ].path = "/2"
302
305
303
- validator ._obj .devices = {1 : 10 , 2 : 20 }
306
+ validator ._obj .devices = {1 : ( 10 , "i1" ), 2 : ( 20 , "i2" ) }
304
307
305
308
validator ._check_dep (2 , 1 )
306
309
validator ._check_dep (1 , 2 )
307
310
308
- validator .log .info .assert_called_once_with ("/2 20 > /1 10" )
311
+ validator .log .info .assert_called_once_with ("/2 <i2> 20 > /1 <i1> 10" )
309
312
validator .log .error .assert_has_calls ([
310
- mock .call ("/1 is initialized before its dependency /2 (10 < 20)" )
313
+ mock .call ("/1 <i1> is initialized before its dependency /2 <i2> (10 < 20)" )
311
314
])
312
315
self .assertEqual (validator .errors , 1 )
313
316
@@ -324,7 +327,7 @@ def test_check_same_prio_assert(self, mock_vinit):
324
327
validator ._ord2node [2 ]._binding = None
325
328
validator ._ord2node [2 ].path = "/2"
326
329
327
- validator ._obj .devices = {1 : 10 , 2 : 10 ,}
330
+ validator ._obj .devices = {1 : ( 10 , "i1" ), 2 : ( 10 , "i2" ) }
328
331
329
332
with self .assertRaises (ValueError ):
330
333
validator ._check_dep (1 , 2 )
0 commit comments