michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: Fix twisterlib for ruff - E713

Browse source 
This fixes ruff linting error E713,
where `not x in y` is used instead
of `x not in y`.

Signed-off-by: Lukasz Mrugala <lukaszx.mrugala@intel.com>
This commit is contained in:
Lukasz Mrugala 2024-11-27 11:51:11 +00:00 • committed by Carles Cufí
commit 39599cafc9
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.ruff-excludes.toml
View file

@ -809,7 +809,6 @@
"B009", # https://docs.astral.sh/ruff/rules/get-attr-with-constant "B009", # https://docs.astral.sh/ruff/rules/get-attr-with-constant
"B904", # https://docs.astral.sh/ruff/rules/raise-without-from-inside-except "B904", # https://docs.astral.sh/ruff/rules/raise-without-from-inside-except
"E501", # https://docs.astral.sh/ruff/rules/line-too-long "E501", # https://docs.astral.sh/ruff/rules/line-too-long
"E713", # https://docs.astral.sh/ruff/rules/not-in-test
"F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders "F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders
"F811", # https://docs.astral.sh/ruff/rules/redefined-while-unused "F811", # https://docs.astral.sh/ruff/rules/redefined-while-unused
"SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if "SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if
@ -844,7 +843,6 @@
"./scripts/pylib/twister/twisterlib/runner.py" = [ "./scripts/pylib/twister/twisterlib/runner.py" = [
"B006", # https://docs.astral.sh/ruff/rules/mutable-argument-default "B006", # https://docs.astral.sh/ruff/rules/mutable-argument-default
"E501", # https://docs.astral.sh/ruff/rules/line-too-long "E501", # https://docs.astral.sh/ruff/rules/line-too-long
"E713", # https://docs.astral.sh/ruff/rules/not-in-test
"F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders "F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders
"SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if "SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if
"SIM115", # https://docs.astral.sh/ruff/rules/open-file-with-context-handler "SIM115", # https://docs.astral.sh/ruff/rules/open-file-with-context-handler
@ -875,7 +873,6 @@
"B904", # https://docs.astral.sh/ruff/rules/raise-without-from-inside-except "B904", # https://docs.astral.sh/ruff/rules/raise-without-from-inside-except
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file "E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
"E501", # https://docs.astral.sh/ruff/rules/line-too-long "E501", # https://docs.astral.sh/ruff/rules/line-too-long
"E713", # https://docs.astral.sh/ruff/rules/not-in-test
"F401", # https://docs.astral.sh/ruff/rules/unused-import "F401", # https://docs.astral.sh/ruff/rules/unused-import
"F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders "F541", # https://docs.astral.sh/ruff/rules/f-string-missing-placeholders
"SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if "SIM102", # https://docs.astral.sh/ruff/rules/collapsible-if

4
scripts/pylib/twister/twisterlib/harness.py
View file

@ -114,7 +114,7 @@ class Harness:
def translate_record(self, record: dict) -> dict: def translate_record(self, record: dict) -> dict:
if self.record_as_json: if self.record_as_json:
for k in self.record_as_json: for k in self.record_as_json:
if not k in record: if k not in record:
continue continue
try: try:
record[k] = json.loads(record[k]) if record[k] else {} record[k] = json.loads(record[k]) if record[k] else {}
@ -296,7 +296,7 @@ class Console(Harness):
elif self.type == "multi_line" and not self.ordered: elif self.type == "multi_line" and not self.ordered:
for i, pattern in enumerate(self.patterns): for i, pattern in enumerate(self.patterns):
r = self.regex[i] r = self.regex[i]
if pattern.search(line) and not r in self.matches: if pattern.search(line) and r not in self.matches:
self.matches[r] = line self.matches[r] = line
logger.debug(f"HARNESS:{self.__class__.__name__}:EXPECTED(" logger.debug(f"HARNESS:{self.__class__.__name__}:EXPECTED("
f"{len(self.matches)}/{self.patterns_expected}):" f"{len(self.matches)}/{self.patterns_expected}):"

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

@ -1619,7 +1619,7 @@ class ProjectBuilder(FilterBuilder):
@staticmethod @staticmethod
def calc_size(instance: TestInstance, from_buildlog: bool): def calc_size(instance: TestInstance, from_buildlog: bool):
if instance.status not in [TwisterStatus.ERROR, TwisterStatus.FAIL, TwisterStatus.SKIP]: if instance.status not in [TwisterStatus.ERROR, TwisterStatus.FAIL, TwisterStatus.SKIP]:
if not instance.platform.type in ["native", "qemu", "unit"]: if instance.platform.type not in ["native", "qemu", "unit"]:
generate_warning = bool(instance.platform.type == "mcu") generate_warning = bool(instance.platform.type == "mcu")
size_calc = instance.calculate_sizes(from_buildlog=from_buildlog, generate_warning=generate_warning) size_calc = instance.calculate_sizes(from_buildlog=from_buildlog, generate_warning=generate_warning)
instance.metrics["used_ram"] = size_calc.get_used_ram() instance.metrics["used_ram"] = size_calc.get_used_ram()

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

@ -1072,7 +1072,7 @@ class TestPlan:
instance.add_filter("Not an emulated platform", Filters.CMD_LINE) instance.add_filter("Not an emulated platform", Filters.CMD_LINE)
elif vendor_platforms: elif vendor_platforms:
self.add_instances(instance_list) self.add_instances(instance_list)
for instance in list(filter(lambda inst: not inst.platform.vendor in vendor_filter, instance_list)): for instance in list(filter(lambda inst: inst.platform.vendor not in vendor_filter, instance_list)):
instance.add_filter("Not a selected vendor platform", Filters.CMD_LINE) instance.add_filter("Not a selected vendor platform", Filters.CMD_LINE)
else: else:
self.add_instances(instance_list) self.add_instances(instance_list)