mirror of
https://github.com/espressif/openthread.git
synced 2026-09-05 16:50:05 +00:00
[test] enhance parsing addresses (#6045)
Expect sometimes matches the pattern before a line is fully printed to TTY. As a result, the address returned may not be accurate. This commit fixes this issue by matching line breaks.
This commit is contained in:
Yakun Xu
@@ -48,77 +48,77 @@ expect -re {Security Policy: \d+, o?n?r?c?b?}
|
||||
send "dataset pending\n"
|
||||
expect "Error 23: NotFound"
|
||||
send "dataset init active\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset activetimestamp 100\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset activetimestamp\n"
|
||||
expect "100"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
if {$channel == 11} {
|
||||
send "dataset channel 18\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset channel\n"
|
||||
expect "18"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
} else {
|
||||
send "dataset channel 11\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset channel\n"
|
||||
expect "11"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
}
|
||||
send "dataset channelmask 0x03fff800\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset channelmask\n"
|
||||
expect "0x03fff800"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset extpanid aabbccddeeff0011\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset extpanid\n"
|
||||
expect "aabbccddeeff0011"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset masterkey aabbccddeeff00112233445566778899\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset masterkey\n"
|
||||
expect "aabbccddeeff00112233445566778899"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset meshlocalprefix fdde:4860::\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset meshlocalprefix\n"
|
||||
expect "fdde:4860:0:0::/64"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset networkname OT-network\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset networkname\n"
|
||||
expect "OT-network"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset panid 0xface\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset panid\n"
|
||||
expect "0xface"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pskc 00112233445566778899aabbccddeeff\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pskc\n"
|
||||
expect "00112233445566778899aabbccddeeff"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset securitypolicy 678 onrcb\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset securitypolicy\n"
|
||||
expect "678 onrcb"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pendingtimestamp 100\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pendingtimestamp\n"
|
||||
expect "100"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset delay 30000\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset delay\n"
|
||||
expect "30000"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset commit pending\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pending\n"
|
||||
expect "Pending Timestamp: 100"
|
||||
expect "Active Timestamp: 100"
|
||||
@@ -136,13 +136,13 @@ expect "Network Name: OT-network"
|
||||
expect "PAN ID: 0xface"
|
||||
expect "PSKc: 00112233445566778899aabbccddeeff"
|
||||
expect "Security Policy: 678, onrcb"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
|
||||
sleep 30
|
||||
|
||||
switch_node 2
|
||||
wait_for "dataset active" "Active Timestamp: 100"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset active\n"
|
||||
expect "Active Timestamp: 100"
|
||||
if {$channel == 11} {
|
||||
@@ -158,11 +158,11 @@ expect "Network Name: OT-network"
|
||||
expect "PAN ID: 0xface"
|
||||
expect "PSKc: 00112233445566778899aabbccddeeff"
|
||||
expect "Security Policy: 678, onrcb"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset clear\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset init active\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset\n"
|
||||
expect "Active Timestamp: 100"
|
||||
if {$channel == 11} {
|
||||
@@ -178,16 +178,12 @@ expect "Network Name: OT-network"
|
||||
expect "PAN ID: 0xface"
|
||||
expect "PSKc: 00112233445566778899aabbccddeeff"
|
||||
expect "Security Policy: 678, onrcb"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset init pending\n"
|
||||
expect "Error 23: NotFound"
|
||||
|
||||
switch_node 1
|
||||
send "ipaddr mleid\n"
|
||||
expect "ipaddr mleid"
|
||||
expect -re {(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4})}
|
||||
set addr $expect_out(1,string)
|
||||
expect "Done"
|
||||
set addr [get_ipaddr mleid]
|
||||
|
||||
switch_node 2
|
||||
send "dataset mgmtgetcommand active \
|
||||
@@ -195,60 +191,60 @@ activetimestamp pendingtimestamp masterkey networkname extpanid \
|
||||
localprefix delaytimer panid channel \
|
||||
-x 000102030405060708090a0b0e0f0c333435 \
|
||||
address $addr\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset mgmtgetcommand pending \
|
||||
activetimestamp pendingtimestamp masterkey networkname extpanid \
|
||||
localprefix delaytimer panid channel \
|
||||
-x 000102030405060708090a0b0e0f0c333435 \
|
||||
address $addr\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
|
||||
switch_node 1
|
||||
send "dataset init active\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset networkname Thread\\ 网络\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset commit active\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset active -x\n"
|
||||
expect "54687265616420e7bd91e7bb9c" ;# UTF-8 of "Thread 网络"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset active -x\n"
|
||||
expect "dataset active -x"
|
||||
expect -re {([0-9a-f]+)[\r\n]+Done}
|
||||
set binary $expect_out(1,string)
|
||||
send "dataset set pending $binary\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pending -x\n"
|
||||
expect $binary
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset pending\n"
|
||||
expect "Network Name: Thread 网络"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset set active $binary\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset mgmtsetcommand active activetimestamp 200 -x 030d54687265616420e7bd91e7bb9c\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset active\n"
|
||||
expect "Network Name: Thread 网络"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset mgmtsetcommand active activetimestamp 210 -x 0301ff\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset active\n"
|
||||
expect "Active Timestamp: 200"
|
||||
expect "Network Name: Thread 网络"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset set active 03023432\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset active\n"
|
||||
expect "Network Name: 42"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset set active 0301bf\n"
|
||||
expect "Error 7: InvalidArgs"
|
||||
send "dataset help\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset init something_invalid\n"
|
||||
expect "Error 7: InvalidArgs"
|
||||
send "dataset active something_invalid\n"
|
||||
@@ -266,7 +262,7 @@ expect "Error 7: InvalidArgs"
|
||||
send "dataset mgmtgetcommand active something_invalid\n"
|
||||
expect "Error 7: InvalidArgs"
|
||||
send "dataset pskc -p 123456\n"
|
||||
expect "Done"
|
||||
expect_line "Done"
|
||||
send "dataset securitypolicy 678 something_invalid\n"
|
||||
expect "Error 7: InvalidArgs"
|
||||
send "dataset set something_invalid 00\n"
|
||||
|
||||
Reference in New Issue
Block a user