mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Fix from PR comments.
Responding to comments from @xavfernandez.
This commit is contained in:
parent
f4f67ea5d2
commit
97667d55f1
1 changed files with 5 additions and 10 deletions
|
@ -285,7 +285,7 @@ def test_install_from_relative_directory(script, data):
|
|||
|
||||
# Create directories in scratch of varying depth to test relative path to
|
||||
# requirements.
|
||||
for relative_depth in range(3):
|
||||
for relative_depth in range(2):
|
||||
# Setup scratch dir with given depth. This is where we call pip from.
|
||||
my_dir = script.scratch_path.join(
|
||||
*[str(i) for i in range(relative_depth)]).mkdir()
|
||||
|
@ -294,12 +294,9 @@ def test_install_from_relative_directory(script, data):
|
|||
to_install_relative = data.packages.join("FSPkg") - my_dir
|
||||
|
||||
# Install from relative path using direct pip invocation.
|
||||
result = script.pip('install', to_install_relative,
|
||||
expect_error=False, cwd=my_dir)
|
||||
assert (fspkg_folder in result.files_created or
|
||||
fspkg_folder in str(result))
|
||||
assert (egg_info_folder in result.files_created or
|
||||
egg_info_folder in str(result))
|
||||
result = script.pip('install', to_install_relative, cwd=my_dir)
|
||||
assert fspkg_folder in result.files_created, str(result)
|
||||
assert egg_info_folder in result.files_created, str(result)
|
||||
script.pip('uninstall', '-y', 'fspkg')
|
||||
|
||||
# Install from relative path using requirements files.
|
||||
|
@ -311,10 +308,8 @@ def test_install_from_relative_directory(script, data):
|
|||
reqs_fmt.format(rel_dir=to_install_relative),
|
||||
my_dir) as reqs_file:
|
||||
result = script.pip_install_local('-r', reqs_file.name,
|
||||
expect_error=False,
|
||||
cwd=my_dir)
|
||||
assert (assert_path in result.files_created or
|
||||
assert_path in str(result))
|
||||
assert assert_path in result.files_created, str(result)
|
||||
script.pip('uninstall', '-y', 'fspkg')
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue