Revert "test: py: Disable sleep test for qemu targets"
This reverts commite27574f9ae. Based on discussion in mainline boardevn variables should be used for skipping incorrect tests. And also reverts commit "py: i2c: Do not run i2c eeprom test on qemu" (sha1:9fe2f228b9) Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
@@ -436,33 +436,6 @@ def setup_boardspec(item):
|
||||
if required_boards and ubconfig.board_type not in required_boards:
|
||||
pytest.skip('board not supported')
|
||||
|
||||
def setup_boardidentity(item):
|
||||
"""Process any 'boardidentity' marker for a test.
|
||||
|
||||
Such a marker lists the set of board identity that a test does/doesn't
|
||||
support. If tests are being executed on an unsupported board, the test is
|
||||
marked to be skipped.
|
||||
|
||||
Args:
|
||||
item: The pytest test item.
|
||||
|
||||
Returns:
|
||||
Nothing.
|
||||
"""
|
||||
mark = item.get_marker('boardidentity')
|
||||
if not mark:
|
||||
return
|
||||
required_boards = []
|
||||
for board in mark.args:
|
||||
if board.startswith('!'):
|
||||
if ubconfig.board_identity == board[1:]:
|
||||
pytest.skip('board identity not supported')
|
||||
return
|
||||
else:
|
||||
required_boards.append(board)
|
||||
if required_boards and ubconfig.board_identity not in required_boards:
|
||||
pytest.skip('board identity not supported')
|
||||
|
||||
def setup_buildconfigspec(item):
|
||||
"""Process any 'buildconfigspec' marker for a test.
|
||||
|
||||
@@ -502,7 +475,6 @@ def pytest_runtest_setup(item):
|
||||
|
||||
start_test_section(item)
|
||||
setup_boardspec(item)
|
||||
setup_boardidentity(item)
|
||||
setup_buildconfigspec(item)
|
||||
|
||||
def pytest_runtest_protocol(item, nextitem):
|
||||
|
||||
@@ -8,5 +8,4 @@
|
||||
[pytest]
|
||||
markers =
|
||||
boardspec: U-Boot: Describes the set of boards a test can/can't run on.
|
||||
boardidentity: U-Boot: Describes the board identity a test can/can't run on.
|
||||
buildconfigspec: U-Boot: Describes Kconfig/config-header constraints.
|
||||
|
||||
@@ -33,7 +33,6 @@ def test_i2c_probe(u_boot_console):
|
||||
response = u_boot_console.run_command("i2c probe")
|
||||
assert(expected_response in response)
|
||||
|
||||
@pytest.mark.boardidentity("!qemu")
|
||||
@pytest.mark.boardspec("zynq_zc702")
|
||||
@pytest.mark.boardspec("zynq_zc706")
|
||||
@pytest.mark.buildconfigspec("cmd_i2c")
|
||||
|
||||
@@ -14,7 +14,6 @@ env__sleep_accurate = False
|
||||
|
||||
"""
|
||||
|
||||
@pytest.mark.boardidentity("!qemu")
|
||||
def test_sleep(u_boot_console):
|
||||
"""Test the sleep command, and validate that it sleeps for approximately
|
||||
the correct amount of time."""
|
||||
|
||||
Reference in New Issue
Block a user