Test and code improvements (#19396)

* some unittests

* wip

* wip

* dead test

* new test

Author: memsharded

conan/api/output.py

@@ -135,17 +135,17 @@ def set_output_level(cls, level):
     @classmethod
     def valid_log_levels(cls):
         return {"quiet": LEVEL_QUIET,  # -vquiet 80
-            "error": LEVEL_ERROR,  # -verror 70
-            "warning": LEVEL_WARNING,  # -vwaring 60
-            "notice": LEVEL_NOTICE,  # -vnotice 50
-            "status": LEVEL_STATUS,  # -vstatus 40
-            None: LEVEL_VERBOSE,  # -v 30
-            "verbose": LEVEL_VERBOSE,  # -vverbose 30
-            "debug": LEVEL_DEBUG,  # -vdebug 20
-            "v": LEVEL_DEBUG,  # -vv 20
-            "trace": LEVEL_TRACE,  # -vtrace 10
-            "vv": LEVEL_TRACE  # -vvv 10
-        }
+                "error": LEVEL_ERROR,  # -verror 70
+                "warning": LEVEL_WARNING,  # -vwaring 60
+                "notice": LEVEL_NOTICE,  # -vnotice 50
+                "status": LEVEL_STATUS,  # -vstatus 40
+                None: LEVEL_VERBOSE,  # -v 30
+                "verbose": LEVEL_VERBOSE,  # -vverbose 30
+                "debug": LEVEL_DEBUG,  # -vdebug 20
+                "v": LEVEL_DEBUG,  # -vv 20
+                "trace": LEVEL_TRACE,  # -vtrace 10
+                "vv": LEVEL_TRACE  # -vvv 10
+                }
 
     @classmethod
     def define_log_level(cls, v):

conan/cli/args.py

@@ -133,7 +133,7 @@ def common_graph_args(subparser):
     subparser.add_argument("--requires", action="append",
                            help='Directly provide requires instead of a conanfile')
     subparser.add_argument("--tool-requires", action='append',
-                                                  help='Directly provide tool-requires instead of a conanfile')
+                           help='Directly provide tool-requires instead of a conanfile')
     add_reference_args(subparser)
     add_lockfile_args(subparser)
 

conan/cli/commands/cache.py

@@ -2,7 +2,7 @@
 
 from conan.api.conan_api import ConanAPI
 from conan.api.model import ListPattern, MultiPackagesList
-from conan.api.output import cli_out_write, ConanOutput
+from conan.api.output import cli_out_write
 from conan.cli import make_abs_path
 from conan.cli.command import conan_command, conan_subcommand, OnceArgument
 from conan.cli.commands.list import print_list_text, print_list_json
@@ -125,6 +125,7 @@ def print_list_check_integrity_json(data):
     myjson = json.dumps(results, indent=4)
     cli_out_write(myjson)
 
+
 @conan_subcommand(formatters={"text": lambda _: (),
                               "json": print_list_check_integrity_json})
 def cache_check_integrity(conan_api: ConanAPI, parser, subparser, *args):

conan/cli/commands/remove.py

@@ -103,7 +103,7 @@ def confirmation(message):
                 result.add_ref(ref)
                 result.recipe_dict(ref).update(ref_dict)  # it doesn't contain "packages"
         else:
-            if not packages: # weird, there is inner package-ids but without prevs
+            if not packages:  # weird, there is inner package-ids but without prevs
                 ConanOutput().info(f"No binaries to remove for '{ref.repr_notime()}'")
                 continue
             for pref, pkg_id_info in packages.items():

conan/cli/commands/report.py

@@ -5,7 +5,6 @@
 from conan.cli.command import conan_command, conan_subcommand
 
 
-
 @conan_command(group="Security")
 def report(conan_api: ConanAPI, parser, *args):
     """
@@ -40,7 +39,7 @@ def report_diff(conan_api, parser, subparser, *args):
     subparser.add_argument("-nr", "--new-reference", help=ref_help.format(type="New"), required=True)
 
     subparser.add_argument("-r", "--remote", action="append", default=None,
-                       help='Look in the specified remote or remotes server')
+                           help='Look in the specified remote or remotes server')
 
     args = parser.parse_args(*args)
 

conan/cli/commands/workspace.py

@@ -193,7 +193,7 @@ def _install_build(conan_api: ConanAPI, parser, subparser, build, *args):
                     ws_pkg = all_editables.get(ref)
                     is_editable = package["binary"] in ("Editable", "EditableBuild")
                     if ws_pkg is None:
-                        if is_editable or package["binary"] == "Build": # Build external to Workspace
+                        if is_editable or package["binary"] == "Build":  # Build extern to Workspace
                             cmd = f'install {package["build_args"]} {profile_args}'
                             ConanOutput().box(f"Workspace building external {ref}")
                             ConanOutput().info(f"Command: {cmd}\n")

conan/cli/formatters/audit/vulnerabilities.py

@@ -142,7 +142,7 @@ def wrap_and_indent(txt, limit=80, indent=2):
                       "through patches applied in the recipe.\nTo verify if a patch has been applied, check the recipe in Conan Center.\n",
                       fg=Color.BRIGHT_YELLOW)
 
-    if total_vulns > 0 or not "error" in result:
+    if total_vulns > 0 or "error" not in result:
         cli_out_write("\nVulnerability information provided by JFrog Catalog. Check "
                       "https://audit.conan.io/jfrogcuration for more information.\n",
                       fg=Color.BRIGHT_GREEN)
@@ -326,7 +326,8 @@ def html_vuln_formatter(result):
     for ref, pkg_info in result["data"].items():
         edges = pkg_info.get("vulnerabilities", {}).get("edges", [])
         if not edges:
-            description = "No vulnerabilities found." if not "error" in pkg_info else pkg_info["error"].get("details", "")
+            description = "No vulnerabilities found." if "error" not in pkg_info \
+                else pkg_info["error"].get("details", "")
             vulns.append({
                 "package": ref,
                 "vuln_id": "-",

conan/internal/api/config/config_installer.py

@@ -177,7 +177,7 @@ def _process_download(config, cache_folder, requester):
             raise ConanException("Error while installing config from %s\n%s" % (config.uri, str(e)))
 
 
-class _ConfigOrigin(object):
+class _ConfigOrigin:
     def __init__(self, uri, config_type, verify_ssl, args, source_folder, target_folder):
         if config_type:
             self.type = config_type

conan/internal/api/detect/detect_api.py

@@ -488,7 +488,8 @@ def _cc_compiler(compiler_exe="cc"):
         compiler = "clang" if "clang" in out else "gcc"
         # clang and gcc have version after a space, first try to find that to skip extra numbers
         # that might appear in the first line of the output before the version
-        # There might also be a leading parenthesis that contains build information, so we try to skip it
+        # There might also be a leading parenthesis that contains build information,
+        # so we try to skip it
         installed_version = re.search(r"(?:\(.*\))? ([0-9]+(\.[0-9]+)*)", out)
         # Fallback to the first number we find optionally followed by other version fields
         installed_version = installed_version or re.search(r"([0-9]+(\.[0-9]+)*)", out)
@@ -532,7 +533,7 @@ def detect_intel_compiler(compiler_exe="icx"):
     try:
         ret, out = detect_runner(f'"{compiler_exe}" --version')
         if ret != 0:
-            return None, None
+            return None, None, None
         compiler = "intel-cc"
         installed_version = re.search(r"(202[0-9]+(\.[0-9])?)", out).group()
         if installed_version:

conan/internal/api/profile/profile_loader.py

@@ -221,7 +221,7 @@ def __init__(self, text):
                 raise ConanException("Error while parsing line %i: '%s'" % (counter, line))
 
 
-class _ProfileValueParser(object):
+class _ProfileValueParser:
     """ parses a "pure" or "effective" profile, with no includes, no variables,
     as the one in the lockfiles, or once these things have been processed by ProfileParser
     """