mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Remove unused tmpdir fixtures from tests
There was also one unused monkeypatch fixture removed.
This commit is contained in:
parent
c928d89647
commit
ad25b61e07
11 changed files with 28 additions and 33 deletions
0
news/0b3269eb-560c-4b8e-8553-9fe205dc62ec.trivial.rst
Normal file
0
news/0b3269eb-560c-4b8e-8553-9fe205dc62ec.trivial.rst
Normal file
|
@ -164,7 +164,7 @@ def test_freeze_with_invalid_names(script):
|
|||
|
||||
|
||||
@pytest.mark.git
|
||||
def test_freeze_editable_not_vcs(script, tmpdir):
|
||||
def test_freeze_editable_not_vcs(script):
|
||||
"""
|
||||
Test an editable install that is not version controlled.
|
||||
"""
|
||||
|
@ -189,7 +189,7 @@ def test_freeze_editable_not_vcs(script, tmpdir):
|
|||
|
||||
|
||||
@pytest.mark.git
|
||||
def test_freeze_editable_git_with_no_remote(script, tmpdir, deprecated_python):
|
||||
def test_freeze_editable_git_with_no_remote(script, deprecated_python):
|
||||
"""
|
||||
Test an editable Git install with no remote url.
|
||||
"""
|
||||
|
@ -214,7 +214,7 @@ def test_freeze_editable_git_with_no_remote(script, tmpdir, deprecated_python):
|
|||
|
||||
|
||||
@need_svn
|
||||
def test_freeze_svn(script, tmpdir):
|
||||
def test_freeze_svn(script):
|
||||
"""Test freezing a svn checkout"""
|
||||
|
||||
checkout_path = _create_test_package(script, vcs="svn")
|
||||
|
@ -237,7 +237,7 @@ def test_freeze_svn(script, tmpdir):
|
|||
run=True,
|
||||
strict=True,
|
||||
)
|
||||
def test_freeze_exclude_editable(script, tmpdir):
|
||||
def test_freeze_exclude_editable(script):
|
||||
"""
|
||||
Test excluding editable from freezing list.
|
||||
"""
|
||||
|
@ -270,7 +270,7 @@ def test_freeze_exclude_editable(script, tmpdir):
|
|||
|
||||
|
||||
@pytest.mark.git
|
||||
def test_freeze_git_clone(script, tmpdir):
|
||||
def test_freeze_git_clone(script):
|
||||
"""
|
||||
Test freezing a Git clone.
|
||||
"""
|
||||
|
@ -328,7 +328,7 @@ def test_freeze_git_clone(script, tmpdir):
|
|||
|
||||
|
||||
@pytest.mark.git
|
||||
def test_freeze_git_clone_srcdir(script, tmpdir):
|
||||
def test_freeze_git_clone_srcdir(script):
|
||||
"""
|
||||
Test freezing a Git clone where setup.py is in a subdirectory
|
||||
relative the repo root and the source code is in a subdirectory
|
||||
|
@ -363,7 +363,7 @@ def test_freeze_git_clone_srcdir(script, tmpdir):
|
|||
|
||||
|
||||
@need_mercurial
|
||||
def test_freeze_mercurial_clone_srcdir(script, tmpdir):
|
||||
def test_freeze_mercurial_clone_srcdir(script):
|
||||
"""
|
||||
Test freezing a Mercurial clone where setup.py is in a subdirectory
|
||||
relative to the repo root and the source code is in a subdirectory
|
||||
|
@ -386,7 +386,7 @@ def test_freeze_mercurial_clone_srcdir(script, tmpdir):
|
|||
|
||||
|
||||
@pytest.mark.git
|
||||
def test_freeze_git_remote(script, tmpdir):
|
||||
def test_freeze_git_remote(script):
|
||||
"""
|
||||
Test freezing a Git clone.
|
||||
"""
|
||||
|
@ -469,7 +469,7 @@ def test_freeze_git_remote(script, tmpdir):
|
|||
|
||||
|
||||
@need_mercurial
|
||||
def test_freeze_mercurial_clone(script, tmpdir):
|
||||
def test_freeze_mercurial_clone(script):
|
||||
"""
|
||||
Test freezing a Mercurial clone.
|
||||
|
||||
|
@ -503,7 +503,7 @@ def test_freeze_mercurial_clone(script, tmpdir):
|
|||
|
||||
|
||||
@need_bzr
|
||||
def test_freeze_bazaar_clone(script, tmpdir):
|
||||
def test_freeze_bazaar_clone(script):
|
||||
"""
|
||||
Test freezing a Bazaar clone.
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ def test_basic_install_editable_from_svn(script):
|
|||
result.assert_installed("version-pkg", with_files=[".svn"])
|
||||
|
||||
|
||||
def _test_install_editable_from_git(script, tmpdir):
|
||||
def _test_install_editable_from_git(script):
|
||||
"""Test cloning from Git."""
|
||||
pkg_path = _create_test_package(script, name="testpackage", vcs="git")
|
||||
args = [
|
||||
|
@ -312,12 +312,12 @@ def _test_install_editable_from_git(script, tmpdir):
|
|||
result.assert_installed("testpackage", with_files=[".git"])
|
||||
|
||||
|
||||
def test_basic_install_editable_from_git(script, tmpdir):
|
||||
_test_install_editable_from_git(script, tmpdir)
|
||||
def test_basic_install_editable_from_git(script):
|
||||
_test_install_editable_from_git(script)
|
||||
|
||||
|
||||
def test_install_editable_from_git_autobuild_wheel(script, tmpdir, with_wheel):
|
||||
_test_install_editable_from_git(script, tmpdir)
|
||||
def test_install_editable_from_git_autobuild_wheel(script, with_wheel):
|
||||
_test_install_editable_from_git(script)
|
||||
|
||||
|
||||
@pytest.mark.network
|
||||
|
@ -375,7 +375,7 @@ def test_install_editable_uninstalls_existing_from_path(script, data):
|
|||
|
||||
|
||||
@need_mercurial
|
||||
def test_basic_install_editable_from_hg(script, tmpdir):
|
||||
def test_basic_install_editable_from_hg(script):
|
||||
"""Test cloning and hg+file install from Mercurial."""
|
||||
pkg_path = _create_test_package(script, name="testpackage", vcs="hg")
|
||||
url = "hg+{}#egg=testpackage".format(path_to_url(pkg_path))
|
||||
|
@ -386,7 +386,7 @@ def test_basic_install_editable_from_hg(script, tmpdir):
|
|||
|
||||
|
||||
@need_mercurial
|
||||
def test_vcs_url_final_slash_normalization(script, tmpdir):
|
||||
def test_vcs_url_final_slash_normalization(script):
|
||||
"""
|
||||
Test that presence or absence of final slash in VCS URL is normalized.
|
||||
"""
|
||||
|
@ -401,7 +401,7 @@ def test_vcs_url_final_slash_normalization(script, tmpdir):
|
|||
|
||||
|
||||
@need_bzr
|
||||
def test_install_editable_from_bazaar(script, tmpdir):
|
||||
def test_install_editable_from_bazaar(script):
|
||||
"""Test checking out from Bazaar."""
|
||||
pkg_path = _create_test_package(script, name="testpackage", vcs="bazaar")
|
||||
args = [
|
||||
|
|
|
@ -158,7 +158,7 @@ def test_install_editable_from_git_with_https(script, tmpdir):
|
|||
|
||||
|
||||
@pytest.mark.network
|
||||
def test_install_noneditable_git(script, tmpdir, with_wheel):
|
||||
def test_install_noneditable_git(script, with_wheel):
|
||||
"""
|
||||
Test installing from a non-editable git URL with a given tag.
|
||||
"""
|
||||
|
|
|
@ -580,7 +580,7 @@ def test_wheel_compile_syntax_error(script, data):
|
|||
assert "SyntaxError: " not in result.stdout
|
||||
|
||||
|
||||
def test_wheel_install_with_no_cache_dir(script, tmpdir, data):
|
||||
def test_wheel_install_with_no_cache_dir(script, data):
|
||||
"""Check wheel installations work, even with no cache."""
|
||||
package = data.packages.joinpath("simple.dist-0.1-py2.py3-none-any.whl")
|
||||
result = script.pip("install", "--no-cache-dir", "--no-index", package)
|
||||
|
|
|
@ -954,12 +954,7 @@ class TestExtraMerge:
|
|||
_wheel_from_index,
|
||||
],
|
||||
)
|
||||
def test_new_resolver_extra_merge_in_package(
|
||||
self,
|
||||
monkeypatch,
|
||||
script,
|
||||
pkg_builder,
|
||||
):
|
||||
def test_new_resolver_extra_merge_in_package(self, script, pkg_builder):
|
||||
create_basic_wheel_for_package(script, "depdev", "1.0.0")
|
||||
create_basic_wheel_for_package(
|
||||
script,
|
||||
|
|
|
@ -364,7 +364,7 @@ def test_pip_wheel_ext_module_with_tmpdir_inside(script, data, common_wheels):
|
|||
|
||||
|
||||
@pytest.mark.network
|
||||
def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
|
||||
def test_pep517_wheels_are_not_confused_with_other_files(script, data):
|
||||
"""Check correct wheels are copied. (#6196)"""
|
||||
pkg_to_wheel = data.src / "withpyproject"
|
||||
add_files_to_dist_directory(pkg_to_wheel)
|
||||
|
@ -377,7 +377,7 @@ def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
|
|||
result.did_create(wheel_file_path)
|
||||
|
||||
|
||||
def test_legacy_wheels_are_not_confused_with_other_files(script, tmpdir, data):
|
||||
def test_legacy_wheels_are_not_confused_with_other_files(script, data):
|
||||
"""Check correct wheels are copied. (#6196)"""
|
||||
pkg_to_wheel = data.src / "simplewheel-1.0"
|
||||
add_files_to_dist_directory(pkg_to_wheel)
|
||||
|
|
|
@ -122,7 +122,7 @@ def test_from_link_vcs_with_source_dir_obtains_commit_id(script, tmpdir):
|
|||
assert direct_url.info.commit_id == commit_id
|
||||
|
||||
|
||||
def test_from_link_vcs_without_source_dir(script, tmpdir):
|
||||
def test_from_link_vcs_without_source_dir(script):
|
||||
direct_url = direct_url_from_link(
|
||||
Link("git+https://g.c/u/p.git@1"), link_is_in_wheel_cache=True
|
||||
)
|
||||
|
|
|
@ -405,7 +405,7 @@ class Failer:
|
|||
raise OSError("Failed")
|
||||
|
||||
|
||||
def test_rmtree_retries(tmpdir, monkeypatch):
|
||||
def test_rmtree_retries(monkeypatch):
|
||||
"""
|
||||
Test pip._internal.utils.rmtree will retry failures
|
||||
"""
|
||||
|
@ -413,7 +413,7 @@ def test_rmtree_retries(tmpdir, monkeypatch):
|
|||
rmtree("foo")
|
||||
|
||||
|
||||
def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
|
||||
def test_rmtree_retries_for_3sec(monkeypatch):
|
||||
"""
|
||||
Test pip._internal.utils.rmtree will retry failures for no more than 3 sec
|
||||
"""
|
||||
|
|
|
@ -67,7 +67,7 @@ def test_wheel_dist_info_dir_wrong_name(tmpdir, zip_dir):
|
|||
assert "does not start with 'simple'" in str(e.value)
|
||||
|
||||
|
||||
def test_wheel_version_ok(tmpdir, data):
|
||||
def test_wheel_version_ok(data):
|
||||
assert wheel.wheel_version(message_from_string("Wheel-Version: 1.9")) == (1, 9)
|
||||
|
||||
|
||||
|
|
|
@ -150,7 +150,7 @@ def test_should_cache(req, expected):
|
|||
assert wheel_builder._should_cache(req) is expected
|
||||
|
||||
|
||||
def test_should_cache_git_sha(script, tmpdir):
|
||||
def test_should_cache_git_sha(script):
|
||||
repo_path = _create_test_package(script, name="mypkg")
|
||||
commit = script.run("git", "rev-parse", "HEAD", cwd=repo_path).stdout.strip()
|
||||
|
||||
|
|
Loading…
Reference in a new issue