From f7e24f2093e88380fae52d3f9eb26767c281f118 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 20 May 2022 10:56:42 +0300
Subject: [PATCH] Drop "test_verbosity_level" configuration option // Issue
 #4276

---
 HISTORY.rst                   |  2 +-
 docs                          |  2 +-
 platformio/project/options.py | 13 -------------
 platformio/test/command.py    |  7 ++-----
 tests/commands/test_test.py   |  1 -
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index e42131cd..6685876e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -16,7 +16,7 @@ PlatformIO Core 6
 6.0.2 (2022-??-??)
 ~~~~~~~~~~~~~~~~~~
 
-* Control |UNITTESTING| verbosity with a new `test_verbosity_level <https://docs.platformio.org/en/latest/projectconf/section_env_test.html#test_verbosity_level>`__ configuration option (`issue #4276 <https://github.com/platformio/platformio-core/issues/4276>`_)
+* Control |UNITTESTING| verbosity with a new multilevel `pio test -v <https://docs.platformio.org/en/latest/core/userguide/cmd_test.html#cmdoption-pio-test-v>`__ command option (`issue #4276 <https://github.com/platformio/platformio-core/issues/4276>`_)
 * Fixed an issue when the `build_src_flags <https://docs.platformio.org/en/latest/projectconf/section_env_build.html#build-src-flags>`__ option was applied outside the project scope (`issue #4277 <https://github.com/platformio/platformio-core/issues/4277>`_)
 
 6.0.1 (2022-05-17)
diff --git a/docs b/docs
index 87c9ffa9..552e995f 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 87c9ffa9ec156b51c7dc57e55db499991ba26100
+Subproject commit 552e995fc57a1c4838c8a34041f48ca9919b09c5
diff --git a/platformio/project/options.py b/platformio/project/options.py
index 42656c36..ad96b24c 100644
--- a/platformio/project/options.py
+++ b/platformio/project/options.py
@@ -697,19 +697,6 @@ ProjectOptions = OrderedDict(
                     "and returns results to the standard output"
                 ),
             ),
-            ConfigEnvOption(
-                group="test",
-                name="test_verbosity_level",
-                description=(
-                    "Verbosity level: "
-                    "0=normal verbosity (default), "
-                    "1=raw testing output, "
-                    "2=base verbosity for buidling/uploading, "
-                    "3=extra verbosity for building/uploading"
-                ),
-                type=click.IntRange(min=0, max=3),
-                default=0,
-            ),
             # Debug
             ConfigEnvOption(
                 group="debug",
diff --git a/platformio/test/command.py b/platformio/test/command.py
index f6feac25..325bbb47 100644
--- a/platformio/test/command.py
+++ b/platformio/test/command.py
@@ -126,7 +126,7 @@ def test_cmd(  # pylint: disable=too-many-arguments,too-many-locals,redefined-bu
         test_names = sorted(set(s.test_name for s in test_suites))
 
         if not verbose:
-            click.echo("Verbosity level can be increased via `-v, --verbose` option")
+            click.echo("Verbosity level can be increased via `-v, -vv, or -vvv` option")
         click.secho("Collected %d tests" % len(test_names), bold=True, nl=not verbose)
         if verbose:
             click.echo(" (%s)" % ", ".join(test_names))
@@ -139,10 +139,7 @@ def test_cmd(  # pylint: disable=too-many-arguments,too-many-locals,redefined-bu
                 test_suite,
                 project_config,
                 TestRunnerOptions(
-                    verbose=verbose
-                    or project_config.get(
-                        f"env:{test_suite.env_name}", "test_verbosity_level"
-                    ),
+                    verbose=verbose,
                     without_building=without_building,
                     without_uploading=without_uploading,
                     without_testing=without_testing,
diff --git a/tests/commands/test_test.py b/tests/commands/test_test.py
index 99fe99f4..71094794 100644
--- a/tests/commands/test_test.py
+++ b/tests/commands/test_test.py
@@ -94,7 +94,6 @@ def test_group_and_custom_runner(clirunner, validate_cliresult, tmp_path: Path):
 [env:native]
 platform = native
 test_framework = custom
-test_verbosity_level = 1
 """
     )
     test_dir = project_dir / "test"