From 71a1d3e4bc61b3cfa78c4e9035b9307862837c14 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 24 Mar 2017 10:14:10 -0400 Subject: [PATCH 1/2] Fixes #530 -- delete a test that has been skipped for 5 years --- tests/functional/test_install_upgrade.py | 25 ------------------------ 1 file changed, 25 deletions(-) diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py index db965f013e1..a8ebf08cb00 100644 --- a/tests/functional/test_install_upgrade.py +++ b/tests/functional/test_install_upgrade.py @@ -314,31 +314,6 @@ def test_uninstall_rollback(script, data): ) -# Issue #530 - temporarily disable flaky test -@pytest.mark.skipif -def test_editable_git_upgrade(script): - """ - Test installing an editable git package from a repository, upgrading the - repository, installing again, and check it gets the newer version - """ - version_pkg_path = _create_test_package(script) - script.pip( - 'install', '-e', - '%s#egg=version_pkg' % ('git+file://' + version_pkg_path), - ) - version = script.run('version_pkg') - assert '0.1' in version.stdout - _change_test_package_version(script, version_pkg_path) - script.pip( - 'install', '-e', - '%s#egg=version_pkg' % ('git+file://' + version_pkg_path), - ) - version2 = script.run('version_pkg') - assert 'some different version' in version2.stdout, ( - "Output: %s" % (version2.stdout) - ) - - @pytest.mark.network def test_should_not_install_always_from_cache(script): """ From 26fe03b20a7327162c78805dcee15b6ed5a5a17f Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 24 Mar 2017 10:23:05 -0400 Subject: [PATCH 2/2] unused imports --- tests/functional/test_install_upgrade.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py index a8ebf08cb00..c477771d843 100644 --- a/tests/functional/test_install_upgrade.py +++ b/tests/functional/test_install_upgrade.py @@ -4,10 +4,7 @@ import pytest -from tests.lib import ( - assert_all_changes, pyversion, _create_test_package, - _change_test_package_version, -) +from tests.lib import assert_all_changes, pyversion from tests.lib.local_repos import local_checkout