From 5c23592fd4838e7ae68f7f2b86f4aefd38ef36ca Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@seco.com>
Date: Mon, 31 Jul 2023 10:30:54 +0200
Subject: [PATCH] Refactoring: merge nested if conditions
See for reference:
https://docs.sourcery.ai/Reference/Python/Default-Rules/merge-nested-ifs/
---
scripts/.sourcery.yaml | 1 -
scripts/analyze_job_logs.py | 5 ++---
scripts/delete_job_artifacts.py | 5 ++---
scripts/lava_api.py | 5 ++---
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/scripts/.sourcery.yaml b/scripts/.sourcery.yaml
index 946b7983..059da1da 100644
--- a/scripts/.sourcery.yaml
+++ b/scripts/.sourcery.yaml
@@ -28,7 +28,6 @@ rule_settings:
- raise-specific-error
- simplify-len-comparison
- de-morgan
- - merge-nested-ifs
- use-named-expression
- use-next
diff --git a/scripts/analyze_job_logs.py b/scripts/analyze_job_logs.py
index 6f6c11f8..cf4c5f9c 100755
--- a/scripts/analyze_job_logs.py
+++ b/scripts/analyze_job_logs.py
@@ -94,9 +94,8 @@ def main(args):
for job in job_it:
if options.filter_status is not None and job.status != options.filter_status:
continue
- if options.filter_tag is not None:
- if not options.filter_tag in job.tag_list:
- continue
+ if options.filter_tag is not None and not options.filter_tag in job.tag_list:
+ continue
log = bytes.decode(job.trace())
if options.pattern in log:
logging.debug(
diff --git a/scripts/delete_job_artifacts.py b/scripts/delete_job_artifacts.py
index 67804bbc..4c160f30 100755
--- a/scripts/delete_job_artifacts.py
+++ b/scripts/delete_job_artifacts.py
@@ -87,9 +87,8 @@ def main(args):
continue
if options.filter_status is not None and job.status != options.filter_status:
continue
- if options.filter_tag is not None:
- if not options.filter_tag in job.tag_list:
- continue
+ if options.filter_tag is not None and not options.filter_tag in job.tag_list:
+ continue
job.delete_artifacts()
logging.debug(
"Deleted artifacts for %s: %s %s.",
diff --git a/scripts/lava_api.py b/scripts/lava_api.py
index dc8d35d0..100e41b1 100755
--- a/scripts/lava_api.py
+++ b/scripts/lava_api.py
@@ -387,9 +387,8 @@ class LavaJob:
self.machine = re.sub(r"\d", "", self.device)
self.device_type = self._jobdetails["requested_device_type"]
- if device_list is not None:
- if self.device in device_list:
- self.device = device_list[self.device]
+ if device_list is not None and self.device in device_list:
+ self.device = device_list[self.device]
self.ok = (
self._jobdetails["state"] == "Finished"
--
GitLab