1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00

Merge pull request #5427 from benoit-pierre/fix_some_tests

Fix some tests
This commit is contained in:
Pradyun Gedam 2018-06-06 13:08:53 +05:30 committed by GitHub
commit 030d48a25e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -129,7 +129,7 @@ def test_cleanup_prevented_upon_build_dir_exception(script, data):
build = script.venv_path / 'build' build = script.venv_path / 'build'
build_simple = build / 'simple' build_simple = build / 'simple'
os.makedirs(build_simple) os.makedirs(build_simple)
write_delete_marker_file(build) write_delete_marker_file(build_simple)
build_simple.join("setup.py").write("#") build_simple.join("setup.py").write("#")
result = script.pip( result = script.pip(
'install', '-f', data.find_links, '--no-index', 'simple', 'install', '-f', data.find_links, '--no-index', 'simple',
@ -137,6 +137,6 @@ def test_cleanup_prevented_upon_build_dir_exception(script, data):
expect_error=True, expect_temp=True, expect_error=True, expect_temp=True,
) )
assert result.returncode == PREVIOUS_BUILD_DIR_ERROR assert result.returncode == PREVIOUS_BUILD_DIR_ERROR, str(result)
assert "pip can't proceed" in result.stderr assert "pip can't proceed" in result.stderr, str(result)
assert exists(build_simple) assert exists(build_simple), str(result)

View file

@ -175,7 +175,7 @@ def test_pip_wheel_fail_cause_of_previous_build_dir(
# Given that I have a previous build dir of the `simple` package # Given that I have a previous build dir of the `simple` package
build = script.venv_path / 'build' / 'simple' build = script.venv_path / 'build' / 'simple'
os.makedirs(build) os.makedirs(build)
write_delete_marker_file(script.venv_path / 'build') write_delete_marker_file(script.venv_path / 'build' / 'simple')
build.join('setup.py').write('#') build.join('setup.py').write('#')
# When I call pip trying to install things again # When I call pip trying to install things again