nots/cli: Убрать выхлоп pnpm из nots test (показывать только при --verbose)

commit_hash:53763489b6fe45c4add50d476dd1029b39717072

Author: khoden

build/plugins/lib/nots/package_manager/base/package_manager.py

@@ -6,7 +6,7 @@
 from .constants import NPM_REGISTRY_URL
 from .package_json import PackageJson
 from .utils import build_nm_path, build_pj_path
-from .timeit import timeit, is_timeit_enabled
+from .timeit import timeit
 
 
 class PackageManagerError(RuntimeError):
@@ -34,6 +34,7 @@ def __init__(
         script_path,
         module_path=None,
         sources_root=None,
+        verbose=False,
     ):
         self.module_path = build_path[len(build_root) + 1 :] if module_path is None else module_path
         self.build_path = build_path
@@ -42,6 +43,7 @@ def __init__(
         self.sources_root = sources_path[: -len(self.module_path) - 1] if sources_root is None else sources_root
         self.nodejs_bin_path = nodejs_bin_path
         self.script_path = script_path
+        self.verbose = verbose
 
     @classmethod
     def load_package_json(cls, path):
@@ -133,18 +135,27 @@ def _exec_command(self, args, cwd: str, include_defaults=True, script_path=None,
             + args
             + (self._get_default_options() if include_defaults else [])
         )
-        p = subprocess.Popen(cmd, cwd=cwd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+        p = subprocess.Popen(
+            cmd,
+            cwd=cwd,
+            stdin=None,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            env=env,
+            text=True,
+            encoding="utf-8",
+        )
         stdout, stderr = p.communicate()
 
-        if is_timeit_enabled():
+        if self.verbose:
             print(f'cd {cwd} && {" ".join(cmd)}', file=sys.stderr)
-            print(f'stdout: {stdout.decode("utf-8")}', file=sys.stderr)
-            print(f'stderr: {stderr.decode("utf-8")}', file=sys.stderr)
+            print(f'stdout: {stdout}', file=sys.stderr) if stdout else None
+            print(f'stderr: {stderr}', file=sys.stderr) if stderr else None
 
         if p.returncode != 0:
             self._dump_debug_log()
 
-            raise PackageManagerCommandError(cmd, p.returncode, stdout.decode("utf-8"), stderr.decode("utf-8"))
+            raise PackageManagerCommandError(cmd, p.returncode, stdout, stderr)
 
     def _nm_path(self, *parts):
         return os.path.join(build_nm_path(self.build_path), *parts)

build/plugins/lib/nots/package_manager/base/timeit.py

@@ -27,11 +27,3 @@ def timeit(func):
         return logging.timeit(func)
     else:
         return func
-
-
-def is_timeit_enabled():
-    logging = import_optional_module("devtools.frontend_build_platform.libraries.logging")
-    if logging:
-        return logging.timeit_options.enabled
-    else:
-        return False