Fix reviewer comments in #11590

ComplianceAsCode · Feb 16, 2024 · dc85741 · dc85741
1 parent 4951763
commit dc85741
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -332,7 +332,7 @@ macro(cce_avail_check TEST_NAME_SUFFIX PRODUCTS CCE_LIST_PATH)
     if(PYTHON_VERSION_MAJOR GREATER 2)
         add_test(
             NAME "cce_avail_check-${TEST_NAME_SUFFIX}"
-            COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/cces-removed.py" --root  "${CMAKE_SOURCE_DIR}" --json "${CMAKE_SOURCE_DIR}/build/rule_dirs.json" --products "${PRODUCTS}" --cee-list "${CCE_LIST_PATH}"
+            COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/cces-removed.py" --root  "${CMAKE_SOURCE_DIR}" --json "${CMAKE_SOURCE_DIR}/build/rule_dirs.json" --products "${PRODUCTS}" --cce-list "${CCE_LIST_PATH}"
         )
         set_tests_properties("cce_avail_check-${TEST_NAME_SUFFIX}" PROPERTIES FIXTURES_REQUIRED "rule-dir-json")
         set_tests_properties("cce_avail_check-${TEST_NAME_SUFFIX}" PROPERTIES DEPENDS "test-rule-dir-json")
@@ -342,4 +342,4 @@ endmacro()
 
 cce_avail_check("rhel-all" "rhel7,rhel8,rhel9" "${CMAKE_SOURCE_DIR}/shared/references/cce-redhat-avail.txt")
 cce_avail_check("sle12" "sle12" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle12-avail.txt")
-cce_avail_check("sle15" "sle15" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle12-avail.txt")
+cce_avail_check("sle15" "sle15" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle15-avail.txt")
diff --git a/tests/cces-removed.py b/tests/cces-removed.py
@@ -1,10 +1,10 @@
-#! /usr/bin/python3
+#!/usr/bin/python3
 
 import argparse
 import json
 import os
-from typing import Set
 import sys
+from typing import Set
 
 SSG_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 JSON_PATH = os.path.join(SSG_ROOT, "build", "rule_dirs.json")
@@ -17,7 +17,7 @@ def _parse_args() -> argparse.Namespace:
                     "run.")
     parser.add_argument('-p', '--products', required=True,
                         help='Comma separated list (no spaces) of products to check')
-    parser.add_argument('-l', '--cee-list', type=str, required=True,
+    parser.add_argument('-l', '--cce-list', type=str, required=True,
                         help='Path to cce avail list')
     parser.add_argument('-j', '--json', type=str, default=JSON_PATH,
                         help='Path to rule_dirs.json file')
@@ -26,23 +26,23 @@ def _parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 
-def _process_rule(cces_in_use, products, rule_obj):
+def _process_rule(cces_in_use: Set[str], products: str, rule_obj: dict):
     for identifier_key, identifier_value in rule_obj['identifiers'].items():
         for product in products.split(","):
             if identifier_key.endswith(product):
                 cces_in_use.add(identifier_value)
 
 
-def _get_cces_in_use(data, products) -> Set[str]:
+def _get_cces_in_use(data: dict, products: str) -> Set[str]:
     cces_in_use: Set[str] = set()
-    for rule_id, rule_obj in data.items():
+    for _, rule_obj in data.items():
         _process_rule(cces_in_use, products, rule_obj)
     return cces_in_use
 
 
-def _get_avail_cces(args) -> Set[str]:
+def _get_avail_cces(cce_list: str) -> Set[str]:
     avail_cces: Set[str] = set()
-    with open(args.cee_list) as f:
+    with open(cce_list) as f:
         for line in f.readlines():
             avail_cces.add(line.strip())
     return avail_cces
@@ -59,12 +59,12 @@ def main():
         print(f"Test is useless, no CCEs were found for products in {','.join(products)}")
         exit(2)
 
-    avail_cces = _get_avail_cces(args)
+    avail_cces = _get_avail_cces(args.cce_list)
 
     not_removed = avail_cces.intersection(cces_in_use)
     if len(not_removed) != 0:
         for cce in not_removed:
-            print(f"CCE {cce} not removed from {args.cee_list}.", file=sys.stderr)
+            print(f"CCE {cce} not removed from {args.cce_list}.", file=sys.stderr)
         exit(1)