Merge pull request #25 from devolo/fix/minor_fixes

minor optimizations

Author: Markus Bong

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [2.2.1] - 2022/03/25
 
-## Fixed
+### Fixed
 
 - Toggling build_url and code_base
 

adaptavist/_helper.py

@@ -15,10 +15,8 @@ def get_executor() -> str:
 
 def build_folder_names(result: Dict[str, Any], folder_name: str = "") -> List[Any]:
     """Build list of folder names from a hierarchical dictionary."""
-    folders = []
     folder_name = "/".join((folder_name, result.get("name", ""))).replace("//", "/")
-    folders.append(folder_name)
-
+    folders = [folder_name]
     if not result.get("children"):
         return folders
 
@@ -37,12 +35,12 @@ def raise_on_kwargs_not_empty(kwargs):
 def update_field(current_values: List[Any], request_data: Dict[str, Any], key: str, new_values: List[Any]) -> None:
     """Append list entries to an existing list and add it to a dictionary, if the new list is different."""
     if new_values and new_values[0] == "-" and current_values != new_values[1:]:
-        request_data.update({key: new_values[1:]})
+        request_data[key] = new_values[1:]
         return
 
     combined_values = current_values + list(set(new_values) - set(current_values))
     if current_values != combined_values:
-        request_data.update({key: combined_values})
+        request_data[key] = combined_values
 
 
 def update_multiline_field(current_content: str, request_data: Dict[str, Any], key: str, new_values: List[str]) -> None:

adaptavist/adaptavist.py

@@ -26,7 +26,7 @@ def __init__(self, jira_server: str, jira_username: str, jira_password: str):
         self.jira_server = jira_server
         self.jira_username = jira_username
 
-        self._adaptavist_api_url = self.jira_server + "/rest/atm/1.0"
+        self._adaptavist_api_url = f'{self.jira_server}/rest/atm/1.0'
         self._authentication = requests.auth.HTTPBasicAuth(self.jira_username, jira_password)
         self._headers = {"Accept": "application/json", "Content-type": "application/json"}
         self._logger = logging.getLogger(__name__)
@@ -163,7 +163,7 @@ def get_test_cases(self, search_mask: str = "folder <= \"/\"") -> List[Dict[str,
             request_url = f"{self._adaptavist_api_url}/testcase/search?query={quote_plus(search_mask)}&startAt={i}"
             self._logger.debug("Asking for test cases with search mask '%s' starting at %i", search_mask, i + 1)
             request = self._get(request_url)
-            result = [] if not request else request.json()
+            result = request.json() if request else []
             if not result:
                 break
             test_cases = [*test_cases, *result]
@@ -507,7 +507,7 @@ def get_test_run_by_name(self, test_run_name: str) -> Dict[str, Any]:
             request_url = f"{self.jira_server}/rest/tests/1.0/testrun/search?startAt={i}&maxResults=10000&query={search_mask}&fields=id,key,name"
             self._logger.debug("Asking for 10000 test runs starting at %i", i + 1)
             request = self._get(request_url)
-            results = [] if not request else request.json()["results"]
+            results = request.json()["results"] if request else []
             if not results:
                 break
             test_runs = [*test_runs, *results]
@@ -535,7 +535,7 @@ def get_test_runs(self, search_mask: str = "folder = \"/\"", **kwargs: Any) -> L
             request_url = f"{self._adaptavist_api_url}/testrun/search?query={quote_plus(search_mask)}&startAt={i}&maxResults=1000&fields={quote_plus(fields)}"
             self._logger.debug("Asking for 1000 test runs starting at %i using search mask %s", i + 1, search_mask)
             request = self._get(request_url)
-            result = [] if not request else request.json()
+            result = request.json() if request else []
             if not result:
                 break
             test_runs = [*test_runs, *result]
@@ -655,7 +655,7 @@ def get_test_execution_results(self, last_result_only: bool = True) -> List[Dict
             request_url = f"{self.jira_server}/rest/tests/1.0/reports/testresults?startAt={i}&maxResults=10000"
             self._logger.debug("Asking for 10000 test results starting at %i", i + 1)
             request = self._get(request_url)
-            results = [] if not request else request.json()["results"]
+            results = request.json()["results"] if request else []
             if not results:
                 break
             test_results = [*test_results, *results]
@@ -746,10 +746,7 @@ def get_test_result(self, test_run_key: str, test_case_key: str) -> Dict[str, An
         :returns: Test result
         """
         response = self.get_test_results(test_run_key)
-        for item in response:
-            if item["testCaseKey"] == test_case_key:
-                return item
-        return {}
+        return next((item for item in response if item["testCaseKey"] == test_case_key), {})
 
     def create_test_result(self, test_run_key: str, test_case_key: str, status: str = STATUS_NOT_EXECUTED, **kwargs: Any) -> Optional[int]:
         """
@@ -995,9 +992,12 @@ def _put(self, request_url: str, data: Any) -> Optional[requests.Response]:
     def _upload_file(self, request_url: str, attachment: BinaryIO, filename: str) -> bool:
         """Upload file to Adaptavist."""
         stream = requests_toolbelt.MultipartEncoder(fields={"file": (filename, attachment, "application/octet-stream")})
-        headers = {**self._headers}
-        headers["Content-type"] = stream.content_type
-        headers["X-Atlassian-Token"] = "nocheck"
+        headers = {
+            **self._headers,
+            "Content-type": stream.content_type,
+            "X-Atlassian-Token": "nocheck",
+        }
+
         filename = filename or attachment.name
 
         try: