alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/efuse_base_mac_test_v5.0' into 'release/v5.0'

Browse Source 
ci: fix base_mac_address test failure for S2 chips (v5.0)

See merge request espressif/esp-idf!19868
This commit is contained in:
Jiang Jiang Jian 2022-09-14 13:52:51 +08:00
commit 89dc570faf
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/system/base_mac_address/pytest_base_mac_address.py
View File

@ -12,16 +12,30 @@ def test_base_mac_address(dut: Dut) -> None:
hex_r = r', '.join((r'0x([0-9a-f]{1,2})',) * 6)
mac_m = dut.expect(r'BASE_MAC: Using "' + hex_r + r'" as base MAC address', timeout=5).groups()
def get_expected_mac_string(increment: int) -> str:
def get_expected_mac_string(increment: int, target: str) -> str:
'''
Return the string representation of the MAC address mac_m with the last octet incremented.
mac_m is an array of strings in hexa-decimal format without the '0x' prefix.
'''
# as a result of some esp32s2 chips burned with one MAC address by mistake,
# there are some MAC address are reserved for this bug fix.
# related mistake MAC address is 0x7cdfa1003000~0x7cdfa1005fff,
# reserved MAC address is 0x7cdfa1020000~0x7cdfa1022fff (MAC address + 0x1d000).
if target == 'esp32s2' and increment == 1:
hex_string = ''.join([m.decode('utf8').rjust(2, '0') for m in mac_m])
mac_bytes = int(hex_string, 16)
if mac_bytes >= int('7cdfa1003000', 16) and mac_bytes <= int('7cdfa1005fff', 16):
mac_bytes += int('1d000', 16)
hex_string = f'{mac_bytes:x}'
# Format the new string to match the expected output from the app (includes stripping leading zeroes)
return ', '.join('0x{}'.format(hex_string[i:i + 2].lstrip('0')) for i in range(0, len(hex_string), 2))
return ', '.join(['0x{}'.format(m.decode('utf8')) for m in mac_m[:-1]] + [hex(int(mac_m[-1], 16) + increment)])
dut.expect_exact('WIFI_STA MAC: ' + get_expected_mac_string(0), timeout=2)
dut.expect_exact('SoftAP MAC: ' + get_expected_mac_string(1))
dut.expect_exact('WIFI_STA MAC: ' + get_expected_mac_string(0, dut.target), timeout=2)
dut.expect_exact('SoftAP MAC: ' + get_expected_mac_string(1, dut.target))
if dut.target != 'esp32s2':
dut.expect_exact('BT MAC: ' + get_expected_mac_string(2))
dut.expect_exact('Ethernet MAC: ' + get_expected_mac_string(3))
dut.expect_exact('BT MAC: ' + get_expected_mac_string(2, dut.target))
dut.expect_exact('Ethernet MAC: ' + get_expected_mac_string(3, dut.target))