Revert "base PR for set polarion as automated (#30)" (#34)

This reverts commit 5245a91.

Author: dbasunag

apps/polarion/polarion_set_automated.py

@@ -1,16 +1,10 @@
-import re
-
-import click
 from simple_logger.logger import get_logger
 import shlex
 import subprocess
+from pylero.exceptions import PyleroLibException
 
-from apps.utils import get_util_config
 
 LOGGER = get_logger(name=__name__)
-AUTOMATED = "automated"
-NOT_AUTOMATED = "notautomated"
-APPROVED = "approved"
 
 
 def git_diff():
@@ -25,74 +19,31 @@ def git_diff_lines():
         LOGGER.debug(line)
         if line.startswith("+"):
             diff.setdefault("added", []).append(line)
-        if line.startswith("-"):
-            diff.setdefault("removed", []).append(line)
+
     return diff
 
 
 def validate_polarion_requirements(
-    polarion_project_id,
     polarion_test_ids,
+    polarion_project_id,
 ):
-    tests_with_missing_requirements = []
-    if polarion_test_ids:
-        from pylero.work_item import TestCase, Requirement
-        from pylero.exceptions import PyleroLibException
-
-        for _id in polarion_test_ids:
-            has_req = False
-            LOGGER.debug(f"Checking if {_id} verifies any requirement")
-            tc = TestCase(project_id=polarion_project_id, work_item_id=_id)
-            for link in tc.linked_work_items:
-                try:
-                    Requirement(project_id=polarion_project_id, work_item_id=link.work_item_id)
-                    has_req = True
-                    break
-                except PyleroLibException:
-                    continue
-
-            if not has_req:
-                LOGGER.error(f"{_id}: Is missing requirement")
-                tests_with_missing_requirements.append(_id)
-    return tests_with_missing_requirements
+    from pylero.work_item import TestCase, Requirement
 
+    tests_with_missing_requirements = []
 
-def find_polarion_ids(polarion_project_id, string_to_match):
-    return re.findall(
-        rf"pytest.mark.polarion.*({polarion_project_id}-[0-9]+)",
-        "\n".join(git_diff_lines().get(string_to_match, [])),
-        re.MULTILINE | re.IGNORECASE,
-    )
-
-
-def get_polarion_project_id(project_id, config_file_path, util_name):
-    polarion_project_id = project_id or get_util_config(util_name=util_name, config_file_path=config_file_path).get(
-        "project_id"
-    )
-    if not polarion_project_id:
-        LOGGER.error("Polarion project id must be passed via config file or command line")
-        raise click.Abort()
-    return polarion_project_id
-
-
-def update_polarion_ids(project_id, is_automated, polarion_ids, is_approved=False):
-    updated_ids = {}
-    if polarion_ids:
-        automation_status = AUTOMATED if is_automated else NOT_AUTOMATED
-
-        from pylero.work_item import TestCase
-        from pylero.exceptions import PyleroLibException
-
-        for id in polarion_ids:
+    for _id in polarion_test_ids:
+        has_req = False
+        LOGGER.debug(f"Checking if {_id} verifies any requirement")
+        tc = TestCase(project_id=polarion_project_id, work_item_id=_id)
+        for link in tc.linked_work_items:
             try:
-                tc = TestCase(project_id=project_id, work_item_id=id)
-                tc.caseautomation = automation_status
-                if is_approved:
-                    tc.status = APPROVED
-                tc.update()
-                LOGGER.debug(f"Polarion {id}: marked as: {automation_status}, approved status set: {is_approved}")
-                updated_ids.setdefault("updated", []).append(id)
-            except PyleroLibException as polarion_exception:
-                LOGGER.warning(f"{id}: {polarion_exception}")
-                updated_ids.setdefault("failed", []).append(id)
-    return updated_ids
+                Requirement(project_id=polarion_project_id, work_item_id=link.work_item_id)
+                has_req = True
+                break
+            except PyleroLibException:
+                continue
+
+        if not has_req:
+            LOGGER.error(f"{_id}: Is missing requirement")
+            tests_with_missing_requirements.append(_id)
+    return tests_with_missing_requirements

apps/polarion/polarion_utils.py

@@ -1,8 +1,13 @@
+import re
 import logging
 from simple_logger.logger import get_logger
 import os
 import click
-from apps.polarion.polarion_utils import validate_polarion_requirements, find_polarion_ids, get_polarion_project_id
+from apps.polarion.polarion_utils import (
+    git_diff_lines,
+    validate_polarion_requirements,
+)
+from apps.utils import get_util_config
 
 LOGGER = get_logger(name="polarion-verify-tc-requirements")
 
@@ -19,16 +24,27 @@
 def has_verify(config_file_path, project_id, verbosity):
     if verbosity:
         LOGGER.setLevel(logging.DEBUG)
-    polarion_project_id = get_polarion_project_id(
-        project_id=project_id, config_file_path=config_file_path, util_name="pyutils-polarion-verify-tc-requirements"
-    )
-    if added_ids := find_polarion_ids(polarion_project_id=polarion_project_id, string_to_match="added"):
+
+    polarion_project_id = project_id or get_util_config(
+        util_name="pyutils-polarion-verify-tc-requirements",
+        config_file_path=config_file_path,
+    ).get("project_id")
+
+    if not polarion_project_id:
+        LOGGER.error("Polarion project id must be passed via config file or command line")
+        raise click.Abort()
+
+    if added_ids := re.findall(
+        rf"pytest.mark.polarion.*({polarion_project_id}-[0-9]+)",
+        "\n".join(git_diff_lines().get("added", [])),
+        re.MULTILINE | re.IGNORECASE,
+    ):
         LOGGER.debug(f"Checking following ids: {added_ids}")
         if tests_with_missing_requirements := validate_polarion_requirements(
             polarion_test_ids=added_ids,
             polarion_project_id=polarion_project_id,
         ):
-            LOGGER.error(f"TestCases with missing requirement: {tests_with_missing_requirements}")
+            click.echo(f"TestCases with missing requirement: {tests_with_missing_requirements}")
             raise click.Abort()
 
 

apps/polarion/polarion_verify_tc_requirements.py

@@ -4,6 +4,4 @@ pyutils-unusedcode:
   exclude_function_prefix:
   - "my_exclude_function_prefix"
 pyutils-polarion-verify-tc-requirements:
-  project_id: "ABCDEF"
-pyutils-polarion-set-automated:
-  project_id: "ABCDEF"
+  project_id: "ABC"

config.example.yaml

@@ -38,7 +38,7 @@ packages = [{ include = "apps" }]
 [tool.poetry.scripts]
 pyutils-unusedcode = "apps.unused_code.unused_code:get_unused_functions"
 pyutils-polarion-verify-tc-requirements = "apps.polarion.polarion_verify_tc_requirements:has_verify"
-pyutils-polarion-set-automated = "apps.polarion.polarion_set_automated:polarion_approve_automate"
+
 
 [tool.poetry.dependencies]
 python = "^3.8"
@@ -58,6 +58,11 @@ enable = true
 pattern = "((?P<epoch>\\d+)!)?(?P<base>\\d+(\\.\\d+)*)"
 
 
+
+
+
+
+
 [tool.poetry.group.test.dependencies]
 pytest = "^8.0.0"
 pytest-cov = "^4.1.0"