From e118bf5c1fb1a660eb34f58c074758743cce6bf4 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 26 Aug 2022 12:24:27 +0800 Subject: [PATCH] test: remove elf sha256 check from pytest_blink to qemu test not upload elf file --- examples/get-started/blink/pytest_blink.py | 20 ------------- .../hello_world/pytest_hello_world.py | 28 +++++++++++++++++-- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/examples/get-started/blink/pytest_blink.py b/examples/get-started/blink/pytest_blink.py index 47d3aaccbd..b7ea802c3b 100644 --- a/examples/get-started/blink/pytest_blink.py +++ b/examples/get-started/blink/pytest_blink.py @@ -1,7 +1,6 @@ # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 -import hashlib import logging import os @@ -9,21 +8,6 @@ import pytest from pytest_embedded_idf.dut import IdfDut -def verify_elf_sha256_embedding(bin_path: str, sha256_reported: str) -> None: - elf_file = os.path.join(bin_path, 'blink.elf') - sha256 = hashlib.sha256() - with open(elf_file, 'rb') as f: - sha256.update(f.read()) - sha256_expected = sha256.hexdigest() - - logging.info(f'ELF file SHA256: {sha256_expected}') - logging.info(f'ELF file SHA256 (reported by the app): {sha256_reported}') - - # the app reports only the first several hex characters of the SHA256, check that they match - if not sha256_expected.startswith(sha256_reported): - raise ValueError('ELF file SHA256 mismatch') - - @pytest.mark.supported_targets @pytest.mark.generic def test_blink(dut: IdfDut) -> None: @@ -31,7 +15,3 @@ def test_blink(dut: IdfDut) -> None: binary_file = os.path.join(dut.app.binary_path, 'blink.bin') bin_size = os.path.getsize(binary_file) logging.info('blink_bin_size : {}KB'.format(bin_size // 1024)) - - sha256_reported = dut.expect(r'ELF file SHA256:\s+([a-f0-9]+)').group(1).decode('utf-8') - - verify_elf_sha256_embedding(dut.app.binary_path, sha256_reported) diff --git a/examples/get-started/hello_world/pytest_hello_world.py b/examples/get-started/hello_world/pytest_hello_world.py index 3cb161c774..7a55984ab1 100644 --- a/examples/get-started/hello_world/pytest_hello_world.py +++ b/examples/get-started/hello_world/pytest_hello_world.py @@ -1,22 +1,46 @@ # SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 +import hashlib +import logging from typing import Callable import pytest from pytest_embedded_idf.dut import IdfDut +from pytest_embedded_qemu.app import QemuApp from pytest_embedded_qemu.dut import QemuDut @pytest.mark.supported_targets @pytest.mark.generic -def test_hello_world(dut: IdfDut, log_minimum_free_heap_size: Callable[..., None]) -> None: +def test_hello_world( + dut: IdfDut, log_minimum_free_heap_size: Callable[..., None] +) -> None: dut.expect('Hello world!') log_minimum_free_heap_size() +def verify_elf_sha256_embedding(app: QemuApp, sha256_reported: str) -> None: + sha256 = hashlib.sha256() + with open(app.elf_file, 'rb') as f: + sha256.update(f.read()) + sha256_expected = sha256.hexdigest() + + logging.info(f'ELF file SHA256: {sha256_expected}') + logging.info(f'ELF file SHA256 (reported by the app): {sha256_reported}') + + # the app reports only the first several hex characters of the SHA256, check that they match + if not sha256_expected.startswith(sha256_reported): + raise ValueError('ELF file SHA256 mismatch') + + @pytest.mark.esp32 # we only support qemu on esp32 for now @pytest.mark.host_test @pytest.mark.qemu -def test_hello_world_host(dut: QemuDut) -> None: +def test_hello_world_host(app: QemuApp, dut: QemuDut) -> None: + sha256_reported = ( + dut.expect(r'ELF file SHA256:\s+([a-f0-9]+)').group(1).decode('utf-8') + ) + verify_elf_sha256_embedding(app, sha256_reported) + dut.expect('Hello world!')