Remove merge_config_settings

2 files changed, 3 insertions, 86 deletions

diff --git a/tests/functional/test_config_settings.py b/tests/functional/test_config_settings.py
index 7d4e3c3d4..35b506a6b 100644
--- a/tests/functional/test_config_settings.py
+++ b/tests/functional/test_config_settings.py
@@ -174,68 +174,11 @@ def test_install_config_reqs(script: PipTestEnvironment) -> None:
     )
     script.scratch_path.joinpath("reqs.txt").write_text(
         'foo --config-settings "--build-option=--cffi" '
-        '--config-settings "--build-option=--avx2"'
+        '--config-settings "--build-option=--avx2" '
+        "--config-settings FOO=BAR"
     )
     script.pip("install", "--no-index", "-f", str(a_sdist.parent), "-r", "reqs.txt")
     script.assert_installed(foo="1.0")
     config = script.site_packages_path / "config.json"
     with open(config, "rb") as f:
-        assert json.load(f) == {"--build-option": ["--cffi", "--avx2"]}
-
-
-def test_merge_cli_reqs_config_settings(script: PipTestEnvironment) -> None:
-    _, _, project_dir = make_project(script.scratch_path)
-    a_sdist = create_basic_sdist_for_package(
-        script,
-        "foo",
-        "1.0",
-        {"pyproject.toml": PYPROJECT_TOML, "backend/dummy_backend.py": BACKEND_SRC},
-    )
-    script.scratch_path.joinpath("reqs.txt").write_text(
-        'foo --config-settings "FOO=HELLO" --config-settings "FOO=BAR" '
-        '--config-settings "BAZ=BAR"'
-    )
-    script.pip(
-        "install",
-        "--no-index",
-        "-f",
-        str(a_sdist.parent),
-        "-r",
-        "reqs.txt",
-        "--config-settings",
-        "FOO=FOOBAR",
-        "--config-settings",
-        "FOO=BARFOO",
-    )
-    script.assert_installed(foo="1.0")
-    config = script.site_packages_path / "config.json"
-    with open(config, "rb") as f:
-        assert json.load(f) == {
-            "FOO": ["HELLO", "BAR", "FOOBAR", "BARFOO"],
-            "BAZ": "BAR",
-        }
-
-
-def test_cli_config_settings_reqs(script: PipTestEnvironment) -> None:
-    _, _, project_dir = make_project(script.scratch_path)
-    a_sdist = create_basic_sdist_for_package(
-        script,
-        "foo",
-        "1.0",
-        {"pyproject.toml": PYPROJECT_TOML, "backend/dummy_backend.py": BACKEND_SRC},
-    )
-    script.scratch_path.joinpath("reqs.txt").write_text("foo")
-    script.pip(
-        "install",
-        "--no-index",
-        "-f",
-        str(a_sdist.parent),
-        "-r",
-        "reqs.txt",
-        "--config-settings",
-        "FOO=BAR",
-    )
-    script.assert_installed(foo="1.0")
-    config = script.site_packages_path / "config.json"
-    with open(config, "rb") as f:
-        assert json.load(f) == {"FOO": "BAR"}
+        assert json.load(f) == {"--build-option": ["--cffi", "--avx2"], "FOO": "BAR"}
diff --git a/tests/unit/test_utils_misc.py b/tests/unit/test_utils_misc.py
deleted file mode 100644
index fed75617b..000000000
--- a/tests/unit/test_utils_misc.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from typing import Dict, List, Optional, Union
-
-import pytest
-
-from pip._internal.utils.misc import merge_config_settings
-
-
-@pytest.mark.parametrize(
-    "reqs, cli, expected",
-    [
-        ({"foo": "bar"}, {"foo": ["baz"]}, {"foo": ["bar", "baz"]}),
-        ({"foo": "bar"}, {"foo": "baz"}, {"foo": ["bar", "baz"]}),
-        ({"foo": ["bar"]}, {"foo": ["baz"]}, {"foo": ["bar", "baz"]}),
-        ({"foo": ["bar"]}, {"foo": "baz"}, {"foo": ["bar", "baz"]}),
-        ({"foo": "bar"}, {"foo": ["baz"]}, {"foo": ["bar", "baz"]}),
-        ({"foo": "bar"}, None, {"foo": "bar"}),
-        (None, {"foo": ["bar"]}, {"foo": ["bar"]}),
-        (None, None, None),
-    ],
-)
-def test_merge_config_settings(
-    reqs: Optional[Dict[str, Union[str, List[str]]]],
-    cli: Optional[Dict[str, Union[str, List[str]]]],
-    expected: Optional[Dict[str, Union[str, List[str]]]],
-) -> None:
-    assert merge_config_settings(reqs, cli) == expected