Commit f6185221 authored by Grzegorz Chwierut's avatar Grzegorz Chwierut Committed by Anas Nashif
Browse files

twister: pytest: Move fixtures to one file 

Fixtures in pytest-twister-harness plugin are moved to one
file to simplify adding new fixtures in the future - no
need to add pytest_plugins entry and register asserts.
Moved also shell fixture from sample dir, because that
fixture can be reused in new tests.

Signed-off-by: default avatarGrzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
parent a6540164

samples/subsys/testsuite/pytest/shell/pytest/test_shell.py

+1 −11
Changes for samples/subsys/testsuite/pytest/shell/pytest/test_shell.py: 1 added line, 11 removed lines.
Original line number Diff line number Diff line
@@ -4,21 +4,11 @@ 


import logging



import pytest

from twister_harness import DeviceAdapter, Shell

from twister_harness import Shell



logger = logging.getLogger(__name__)





@pytest.fixture(scope='function')

def shell(dut: DeviceAdapter) -> Shell:

    """Return ready to use shell interface"""

    shell = Shell(dut, timeout=20.0)

    logger.info('wait for prompt')

    assert shell.wait_for_prompt()

    return shell





def test_shell_print_help(shell: Shell):

    logger.info('send "help" command')

    lines = shell.exec_command('help')

scripts/pylib/pytest-twister-harness/src/twister_harness/__init__.py

+1 −1
Changes for scripts/pylib/pytest-twister-harness/src/twister_harness/__init__.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# flake8: noqa



from twister_harness.device.device_adapter import DeviceAdapter

from twister_harness.fixtures.mcumgr import MCUmgr

from twister_harness.helpers.mcumgr import MCUmgr

from twister_harness.helpers.shell import Shell



__all__ = ['DeviceAdapter', 'MCUmgr', 'Shell']

scripts/pylib/pytest-twister-harness/src/twister_harness/fixtures/dut.py→scripts/pylib/pytest-twister-harness/src/twister_harness/fixtures.py

+22 −0
Changes for scripts/pylib/pytest-twister-harness/src/twister_harness/fixtures.py: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ import pytest 
from twister_harness.device.device_adapter import DeviceAdapter

from twister_harness.device.factory import DeviceFactory

from twister_harness.twister_harness_config import DeviceConfig, TwisterHarnessConfig

from twister_harness.helpers.shell import Shell

from twister_harness.helpers.mcumgr import MCUmgr



logger = logging.getLogger(__name__)
@@ -44,3 +46,23 @@ def dut(request: pytest.FixtureRequest, device_object: DeviceAdapter) -> Generat 
        yield device_object

    finally:  # to make sure we close all running processes execution

        device_object.close()





@pytest.fixture(scope='function')

def shell(dut: DeviceAdapter) -> Shell:

    """Return ready to use shell interface"""

    shell = Shell(dut, timeout=20.0)

    logger.info('Wait for prompt')

    assert shell.wait_for_prompt()

    return shell





@pytest.fixture(scope='session')

def is_mcumgr_available() -> None:

    if not MCUmgr.is_available():

        pytest.skip('mcumgr not available')





@pytest.fixture()

def mcumgr(is_mcumgr_available: None, dut: DeviceAdapter) -> Generator[MCUmgr, None, None]:

    yield MCUmgr.create_for_serial(dut.device_config.serial)

scripts/pylib/pytest-twister-harness/src/twister_harness/fixtures/__init__.py

deleted100644 → 0
+0 −8
Changes for scripts/pylib/pytest-twister-harness/src/twister_harness/fixtures/__init__.py: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line 
# Copyright (c) 2023 Nordic Semiconductor ASA

#

# SPDX-License-Identifier: Apache-2.0



import pytest



pytest.register_assert_rewrite('twister_harness.fixtures.dut')

pytest.register_assert_rewrite('twister_harness.fixtures.mcumgr')

scripts/pylib/pytest-twister-harness/src/twister_harness/fixtures/mcumgr.py→scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/mcumgr.py

+0 −16
Changes for scripts/pylib/pytest-twister-harness/src/twister_harness/helpers/mcumgr.py: 0 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -3,19 +3,14 @@ 
# SPDX-License-Identifier: Apache-2.0

from __future__ import annotations



import pytest

import logging

import re

import shlex



from typing import Generator

from subprocess import check_output, getstatusoutput

from pathlib import Path

from dataclasses import dataclass



from twister_harness.device.device_adapter import DeviceAdapter





logger = logging.getLogger(__name__)
@@ -108,14 +103,3 @@ class MCUmgr: 
            image_list = self.get_image_list()

            hash = image_list[0].hash

        self.run_command(f'image confirm {hash}')
 




@pytest.fixture(scope='session')

def is_mcumgr_available() -> None:

    if not MCUmgr.is_available():

        pytest.skip('mcumgr not available')





@pytest.fixture()

def mcumgr(is_mcumgr_available: None, dut: DeviceAdapter) -> Generator[MCUmgr, None, None]:

    yield MCUmgr.create_for_serial(dut.device_config.serial)

CRA Git | Maintained and supported by SUSTech CRA and CCSE