From 91afd80a39f273616f5f67885f094ad3e5173bf3 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Sat, 14 May 2016 13:03:53 +0200 Subject: [PATCH] Fix a bunch of other tests Add a --no-index to avoid network calls --- tests/functional/test_install.py | 10 +++++----- tests/functional/test_install_upgrade.py | 2 +- tests/functional/test_uninstall.py | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 5ab2b79ce..ce3816128 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -804,8 +804,8 @@ def test_install_upgrade_editable_depending_on_other_editable(script): version='0.1') """)) script.pip('install', '--editable', pkga_path) - result = script.pip('list') - assert "pkga" in result.stdout + result = script.pip('list', '--format=freeze') + assert "pkga==0.1" in result.stdout script.scratch_path.join("pkgb").mkdir() pkgb_path = script.scratch_path / 'pkgb' @@ -815,9 +815,9 @@ def test_install_upgrade_editable_depending_on_other_editable(script): version='0.1', install_requires=['pkga']) """)) - script.pip('install', '--upgrade', '--editable', pkgb_path) - result = script.pip('list') - assert "pkgb" in result.stdout + script.pip('install', '--upgrade', '--editable', pkgb_path, '--no-index') + result = script.pip('list', '--format=freeze') + assert "pkgb==0.1" in result.stdout def test_install_subprocess_output_handling(script, data): diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py index 3a6ba58a1..8762bcac6 100644 --- a/tests/functional/test_install_upgrade.py +++ b/tests/functional/test_install_upgrade.py @@ -361,7 +361,7 @@ class TestUpgradeDistributeToSetuptools(object): "Found existing installation: distribute 0.6.34" in result.stdout ) result = self.script.run( - self.ve_bin / 'pip', 'list', + self.ve_bin / 'pip', 'list', '--format=legacy', expect_stderr=True if sys.version_info[:2] == (2, 6) else False, ) assert "setuptools (0.9.8)" in result.stdout diff --git a/tests/functional/test_uninstall.py b/tests/functional/test_uninstall.py index 882d1454a..a41881e99 100644 --- a/tests/functional/test_uninstall.py +++ b/tests/functional/test_uninstall.py @@ -47,10 +47,10 @@ def test_simple_uninstall_distutils(script): ) """)) result = script.run('python', pkg_path / 'setup.py', 'install') - result = script.pip('list') + result = script.pip('list', '--format=legacy') assert "distutils-install (0.1)" in result.stdout script.pip('uninstall', 'distutils_install', '-y', expect_stderr=True) - result2 = script.pip('list') + result2 = script.pip('list', '--format=legacy') assert "distutils-install (0.1)" not in result2.stdout @@ -173,10 +173,10 @@ def test_uninstall_entry_point(script): ) """)) result = script.pip('install', pkg_path) - result = script.pip('list') + result = script.pip('list', '--format=legacy') assert "ep-install (0.1)" in result.stdout script.pip('uninstall', 'ep_install', '-y') - result2 = script.pip('list') + result2 = script.pip('list', '--format=legacy') assert "ep-install (0.1)" not in result2.stdout @@ -416,7 +416,7 @@ def test_uninstall_setuptools_develop_install(script, data): expect_stderr=True, cwd=pkg_path) script.run('python', 'setup.py', 'install', expect_stderr=True, cwd=pkg_path) - list_result = script.pip('list') + list_result = script.pip('list', '--format=legacy') assert "FSPkg (0.1.dev0, " in list_result.stdout # Uninstall both develop and install uninstall = script.pip('uninstall', 'FSPkg', '-y') @@ -426,5 +426,5 @@ def test_uninstall_setuptools_develop_install(script, data): assert join( script.site_packages, 'FSPkg.egg-link' ) in uninstall2.files_deleted, list(uninstall2.files_deleted.keys()) - list_result2 = script.pip('list') + list_result2 = script.pip('list', '--format=legacy') assert "FSPkg" not in list_result2.stdout