do not return the action identifier from the log

Author: gaborbernat

docs/changelog/1222.bugfix.rst

@@ -0,0 +1,2 @@
+Changes to the plugin tester module (cmd no longer sets ``PYTHONPATH``), and ``action.popen`` no longer returns the
+command identifier information from within the logs. No public facing changes.

src/tox/action.py

@@ -104,7 +104,9 @@ def popen(
                 exit_code = process.returncode
             finally:
                 if out_path is not None and out_path.exists():
-                    output = out_path.read()
+                    lines = out_path.read().split("\n")
+                    # first three lines are the action, cwd, and cmd - remove it
+                    output = "\n".join(lines[3:])
                 try:
                     if exit_code and not ignore_ret:
                         if report_fail:
@@ -210,11 +212,13 @@ def _get_standard_streams(self, capture_err, cmd_args_shell, redirect, returnout
         if self.generate_tox_log or redirect:
             out_path = self.get_log_path(self.name)
             with out_path.open("wt") as stdout, out_path.open("rb") as input_file_handler:
-                stdout.write(
-                    "action: {}, msg: {}\ncwd: {}\ncmd: {}\n".format(
-                        self.name, self.msg, cwd, cmd_args_shell
-                    )
+                msg = "action: {}, msg: {}\ncwd: {}\ncmd: {}\n".format(
+                    self.name.replace("\n", " "),
+                    self.msg.replace("\n", " "),
+                    str(cwd).replace("\n", " "),
+                    cmd_args_shell.replace("\n", " "),
                 )
+                stdout.write(msg)
                 stdout.flush()
                 input_file_handler.read()  # read the header, so it won't be written to stdout
                 yield input_file_handler, out_path, stderr, stdout

src/tox/venv.py

@@ -737,7 +737,7 @@ def tox_runtest_post(venv):
 def tox_runenvreport(venv, action):
     # write out version dependency information
     args = venv.envconfig.list_dependencies_command
-    output = venv._pcall(args, cwd=venv.envconfig.config.toxinidir, action=action)
+    output = venv._pcall(args, cwd=venv.envconfig.config.toxinidir, action=action, returnout=True)
     # the output contains a mime-header, skip it
     output = output.split("\n\n")[-1]
     packages = output.strip().split("\n")

tests/unit/test_z_cmdline.py

@@ -467,8 +467,8 @@ def test_result_json(cmd, initproj, example123):
             deps = setuptools
             commands_pre = python -c 'print("START")'
             commands = python -c 'print("OK")'
-                       - python -c 'raise SystemExit(1)'
-                       python -c 'raise SystemExit(2)'
+                       - python -c 'print("1"); raise SystemExit(1)'
+                       python -c 'print("1"); raise SystemExit(2)'
                        python -c 'print("SHOULD NOT HAPPEN")'
             commands_post = python -c 'print("END")'
         """
@@ -730,6 +730,7 @@ def test_empty_activity_shown_verbose(initproj, cmd):
             [testenv]
             list_dependencies_command=echo
             commands={envpython} --version
+            whitelist_externals = echo
     """
         },
     )