michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: Twister ConfigurationError Fix

Browse source 
Current implementation of ConfigurationError causes
an exception to be thrown.
It is because a PosixPath is being concatenated with an str with a '+'
operator, which is not permitted.
The path in question is now cast to an str.
Additional test has been added to test_twister.py to track regressions.

Signed-off-by: Lukasz Mrugala <lukaszx.mrugala@intel.com>
This commit is contained in:
Lukasz Mrugala 2023-05-23 13:57:09 +02:00 • committed by Anas Nashif
commit 6ce37948a0
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/pylib/twister/twisterlib/error.py
View file

@ -13,7 +13,7 @@ class TwisterRuntimeError(TwisterException):
class ConfigurationError(TwisterException):
def __init__(self, cfile, message):
TwisterException.__init__(self, cfile + ": " + message)
TwisterException.__init__(self, str(cfile) + ": " + message)
class BuildError(TwisterException):

14
scripts/tests/twister/test_twister.py
View file

@ -16,6 +16,7 @@ ZEPHYR_BASE = os.getenv("ZEPHYR_BASE")
sys.path.insert(0, os.path.join(ZEPHYR_BASE, "scripts/pylib/twister"))
import scl
from twisterlib.error import ConfigurationError
from twisterlib.testplan import TwisterConfigParser
def test_yamlload():
@ -77,3 +78,16 @@ def test_testsuite_config_files():
# Check extra kconfig statements, too
assert scenario["extra_configs"] == ["CONFIG_FOO=y"]
def test_configuration_error():
"""Test to validate that the ConfigurationError is raisable without further errors.
It ought to have an str with a path, colon and a message as its only args entry.
"""
filename = Path(ZEPHYR_BASE) / "scripts/tests/twister/test_twister.py"
with pytest.raises(ConfigurationError) as exception:
raise ConfigurationError(filename, "Dummy message.")
assert len(exception.value.args) == 1
assert exception.value.args[0] == str(filename) + ": " + "Dummy message."