Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an upgrade-strategy option #3972

Merged
merged 7 commits into from
Sep 18, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Shorten test names, correct descriptions
  • Loading branch information
pradyunsg committed Sep 18, 2016
commit 61d8d6ab270cd5f96db5c87dcee3411f5a32f082
14 changes: 7 additions & 7 deletions tests/functional/test_install_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_invalid_upgrade_strategy_causes_error(script):
assert "upgrade strategy provided: 'bazinga'" in result.stderr


def test_non_eager_does_not_upgrade_dependecies_if_existing_version_satisfies(script):
def test_non_eager_does_not_upgrade_dependecies_when_satisfied(script):
"""
It doesn't upgrade a dependency if it already satisfies the requirements.

Expand All @@ -58,9 +58,9 @@ def test_non_eager_does_not_upgrade_dependecies_if_existing_version_satisfies(sc
), "should not have uninstalled simple==2.0"


def test_non_eager_upgrade_dependecies_if_existing_version_does_not_satisfy(script):
def test_non_eager_does_upgrade_dependecies_when_no_longer_satisfied(script):
"""
It does upgrade a dependency if it already satisfies the requirements.
It does upgrade a dependency if it no longer satisfies the requirements.

"""
script.pip_install_local('simple==1.0', expect_error=True)
Expand All @@ -83,9 +83,9 @@ def test_non_eager_upgrade_dependecies_if_existing_version_does_not_satisfy(scri
), "should have uninstalled simple==1.0"


def test_eager_does_upgrade_dependecies_if_existing_version_satisfies(script):
def test_eager_does_upgrade_dependecies_when_currently_satisfied(script):
"""
It doesn't upgrade a dependency if it already satisfies the requirements.
It does upgrade a dependency even if it already satisfies the requirements.

"""
script.pip_install_local('simple==2.0', expect_error=True)
Expand All @@ -104,9 +104,9 @@ def test_eager_does_upgrade_dependecies_if_existing_version_satisfies(script):
), "should have uninstalled simple==2.0"


def test_eager_upgrade_dependecies_if_existing_version_does_not_satisfy(script):
def test_eager_does_upgrade_dependecies_when_no_longer_satisfied(script):
"""
It does upgrade a dependency if it already satisfies the requirements.
It does upgrade a dependency if it no longer satisfies the requirements.

"""
script.pip_install_local('simple==1.0', expect_error=True)
Expand Down