summaryrefslogtreecommitdiff
path: root/tests/functional
diff options
context:
space:
mode:
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/test_install.py10
-rw-r--r--tests/functional/test_install_upgrade.py2
-rw-r--r--tests/functional/test_list.py201
-rw-r--r--tests/functional/test_uninstall.py12
4 files changed, 118 insertions, 107 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_list.py b/tests/functional/test_list.py
index 928705c12..74dcc886c 100644
--- a/tests/functional/test_list.py
+++ b/tests/functional/test_list.py
@@ -1,20 +1,24 @@
+import json
import os
import pytest
-WARN_NOCOL = ("DEPRECATION: The --no-columns option will be "
- "removed in the future.")
+WARN_FORMAT = ("DEPRECATION: The default format will switch to columns in the "
+ "future. You can use --format=legacy (or define a list_format "
+ "in your pip.conf) to disable this warning.")
def test_list_command(script, data):
"""
- Test default behavior of list command.
+ Test default behavior of list command without format specifier.
+ A warning is expected.
"""
script.pip(
'install', '-f', data.find_links, '--no-index', 'simple==1.0',
'simple2==3.0',
)
- result = script.pip('list')
+ result = script.pip('list', expect_stderr=True)
+ assert WARN_FORMAT in result.stderr, str(result)
assert 'simple (1.0)' in result.stdout, str(result)
assert 'simple2 (3.0)' in result.stdout, str(result)
@@ -35,51 +39,34 @@ def test_columns_flag(script, data):
assert 'simple2 3.0' in result.stdout, str(result)
-def test_nocolumns_flag(script, data):
+def test_legacy_format(script, data):
"""
- Test that --no-columns raises the deprecation warning and still outputs
- the old-style formatting.
+ Test that legacy format
"""
script.pip(
'install', '-f', data.find_links, '--no-index', 'simple==1.0',
'simple2==3.0',
)
- result = script.pip('list', '--no-columns', expect_stderr=True)
- assert WARN_NOCOL in result.stderr, str(result)
+ result = script.pip('list', '--format=legacy')
assert 'simple (1.0)' in result.stdout, str(result)
assert 'simple2 (3.0)' in result.stdout, str(result)
-def test_columns_nocolumns(script, data):
+def test_format_priority(script, data):
"""
- Test that --no-columns has priority in --columns --no-columns.
+ Test that latest format has priority over previous ones.
"""
script.pip(
'install', '-f', data.find_links, '--no-index', 'simple==1.0',
'simple2==3.0',
)
- result = script.pip(
- 'list', '--columns', '--no-columns',
- expect_error=True,
- )
- assert WARN_NOCOL in result.stderr, str(result)
+ result = script.pip('list', '--format=columns', '--format=legacy')
assert 'simple (1.0)' in result.stdout, str(result)
assert 'simple2 (3.0)' in result.stdout, str(result)
assert 'simple 1.0' not in result.stdout, str(result)
assert 'simple2 3.0' not in result.stdout, str(result)
-
-def test_nocolumns_columns(script, data):
- """
- Test that --columns has priority in --no-columns --columns.
- """
- script.pip(
- 'install', '-f', data.find_links, '--no-index', 'simple==1.0',
- 'simple2==3.0',
- )
- result = script.pip(
- 'list', '--no-columns', '--columns',
- )
+ result = script.pip('list', '--format=legacy', '--columns')
assert 'Package' in result.stdout, str(result)
assert 'Version' in result.stdout, str(result)
assert 'simple (1.0)' not in result.stdout, str(result)
@@ -94,7 +81,7 @@ def test_local_flag(script, data):
"""
script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
- result = script.pip('list', '--local')
+ result = script.pip('list', '--local', '--format=legacy')
assert 'simple (1.0)' in result.stdout
@@ -111,14 +98,13 @@ def test_local_columns_flag(script, data):
assert 'simple 1.0' in result.stdout, str(result)
-def test_local_nocolumns_flag(script, data):
+def test_local_legacy_flag(script, data):
"""
- Test the behavior of --local --no-columns flags in the list
+ Test the behavior of --local --format=legacy flags in the list
command.
"""
script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
- result = script.pip('list', '--local', '--no-columns', expect_stderr=True)
- assert WARN_NOCOL in result.stderr, str(result)
+ result = script.pip('list', '--local', '--format=legacy')
assert 'simple (1.0)' in result.stdout
@@ -131,7 +117,7 @@ def test_user_flag(script, data, virtualenv):
script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
script.pip('install', '-f', data.find_links, '--no-index',
'--user', 'simple2==2.0')
- result = script.pip('list', '--user')
+ result = script.pip('list', '--user', '--format=legacy')
assert 'simple (1.0)' not in result.stdout
assert 'simple2 (2.0)' in result.stdout
@@ -152,7 +138,7 @@ def test_user_columns_flag(script, data, virtualenv):
assert 'simple2 2.0' in result.stdout, str(result)
-def test_user_nocolumns_flag(script, data, virtualenv):
+def test_user_legacy(script, data, virtualenv):
"""
Test the behavior of --user flag in the list command
@@ -161,8 +147,7 @@ def test_user_nocolumns_flag(script, data, virtualenv):
script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
script.pip('install', '-f', data.find_links, '--no-index',
'--user', 'simple2==2.0')
- result = script.pip('list', '--user', '--no-columns', expect_stderr=True)
- assert WARN_NOCOL in result.stderr, str(result)
+ result = script.pip('list', '--user', '--format=legacy')
assert 'simple (1.0)' not in result.stdout
assert 'simple2 (2.0)' in result.stdout, str(result)
@@ -183,7 +168,7 @@ def test_uptodate_flag(script, data):
)
result = script.pip(
'list', '-f', data.find_links, '--no-index', '--uptodate',
- expect_stderr=True,
+ '--format=legacy',
)
assert 'simple (1.0)' not in result.stdout # 3.0 is latest
assert 'pip-test-package (0.1.1,' in result.stdout # editables included
@@ -217,9 +202,9 @@ def test_uptodate_columns_flag(script, data):
@pytest.mark.network
-def test_uptodate_nocolumns_flag(script, data):
+def test_uptodate_legacy_flag(script, data):
"""
- Test the behavior of --uptodate --no-columns flag in the list command
+ Test the behavior of --uptodate --format=legacy flag in the list command
"""
script.pip(
@@ -232,9 +217,8 @@ def test_uptodate_nocolumns_flag(script, data):
)
result = script.pip(
'list', '-f', data.find_links, '--no-index', '--uptodate',
- '--no-columns', expect_stderr=True,
+ '--format=legacy',
)
- assert WARN_NOCOL in result.stderr, str(result)
assert 'simple (1.0)' not in result.stdout # 3.0 is latest
assert 'pip-test-package (0.1.1,' in result.stdout # editables included
assert 'simple2 (3.0)' in result.stdout, str(result)
@@ -257,7 +241,7 @@ def test_outdated_flag(script, data):
)
result = script.pip(
'list', '-f', data.find_links, '--no-index', '--outdated',
- expect_stderr=True,
+ '--format=legacy',
)
assert 'simple (1.0) - Latest: 3.0 [sdist]' in result.stdout
assert 'simplewheel (1.0) - Latest: 2.0 [wheel]' in result.stdout
@@ -301,9 +285,9 @@ def test_outdated_columns_flag(script, data):
@pytest.mark.network
-def test_outdated_nocolumns_flag(script, data):
+def test_outdated_legacy(script, data):
"""
- Test the behavior of --outdated --no-columns flag in the list command
+ Test the behavior of --outdated --format=legacy flag in the list command
"""
script.pip(
@@ -317,9 +301,8 @@ def test_outdated_nocolumns_flag(script, data):
)
result = script.pip(
'list', '-f', data.find_links, '--no-index', '--outdated',
- '--no-columns', expect_stderr=True,
+ '--format=legacy',
)
- assert WARN_NOCOL in result.stderr, str(result)
assert 'simple (1.0) - Latest: 3.0 [sdist]' in result.stdout
assert 'simplewheel (1.0) - Latest: 2.0 [wheel]' in result.stdout
assert 'pip-test-package (0.1, ' in result.stdout
@@ -337,7 +320,7 @@ def test_editables_flag(script, data):
'install', '-e',
'git+https://github.com/pypa/pip-test-package.git#egg=pip-test-package'
)
- result = script.pip('list', '--editable')
+ result = script.pip('list', '--editable', '--format=legacy')
assert 'simple (1.0)' not in result.stdout, str(result)
assert os.path.join('src', 'pip-test-package') in result.stdout, (
str(result)
@@ -364,7 +347,7 @@ def test_editables_columns_flag(script, data):
@pytest.mark.network
-def test_editables_nocolumns_flag(script, data):
+def test_editables_legacy(script, data):
"""
Test the behavior of --editables flag in the list command
"""
@@ -374,9 +357,8 @@ def test_editables_nocolumns_flag(script, data):
'git+https://github.com/pypa/pip-test-package.git#egg=pip-test-package'
)
result = script.pip(
- 'list', '--editable', '--no-columns', expect_stderr=True,
+ 'list', '--editable', '--format=legacy', expect_stderr=True,
)
- assert WARN_NOCOL in result.stderr, str(result)
assert 'simple (1.0)' not in result.stdout, str(result)
assert os.path.join('src', 'pip-test-package') in result.stdout, (
str(result)
@@ -396,7 +378,7 @@ def test_uptodate_editables_flag(script, data):
result = script.pip(
'list', '-f', data.find_links, '--no-index',
'--editable', '--uptodate',
- expect_stderr=True,
+ '--format=legacy',
)
assert 'simple (1.0)' not in result.stdout, str(result)
assert os.path.join('src', 'pip-test-package') in result.stdout, (
@@ -428,9 +410,9 @@ def test_uptodate_editables_columns_flag(script, data):
@pytest.mark.network
-def test_uptodate_editables_nocolumns_flag(script, data):
+def test_uptodate_editables_legacy(script, data):
"""
- test the behavior of --editable --uptodate --columns --no-columns flag
+ test the behavior of --editable --uptodate --columns --format=legacy flag
in the list command
"""
script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
@@ -440,9 +422,8 @@ def test_uptodate_editables_nocolumns_flag(script, data):
)
result = script.pip(
'list', '-f', data.find_links, '--no-index', '--editable',
- '--uptodate', '--no-columns', expect_stderr=True,
+ '--uptodate', '--format=legacy',
)
- assert WARN_NOCOL in result.stderr, str(result)
assert 'simple (1.0)' not in result.stdout, str(result)
assert os.path.join('src', 'pip-test-package') in result.stdout, (
str(result)
@@ -463,7 +444,7 @@ def test_outdated_editables_flag(script, data):
result = script.pip(
'list', '-f', data.find_links, '--no-index',
'--editable', '--outdated',
- expect_stderr=True,
+ '--format=legacy',
)
assert 'simple (1.0)' not in result.stdout, str(result)
assert os.path.join('src', 'pip-test-package') in result.stdout, (
@@ -495,7 +476,7 @@ def test_outdated_editables_columns_flag(script, data):
@pytest.mark.network
-def test_outdated_editables_nocolumns_flag(script, data):
+def test_outdated_editables_legacy(script, data):
"""
test the behavior of --editable --outdated flag in the list command
"""
@@ -507,10 +488,8 @@ def test_outdated_editables_nocolumns_flag(script, data):
)
result = script.pip(
'list', '-f', data.find_links, '--no-index',
- '--editable', '--outdated', '--no-columns',
- expect_stderr=True,
+ '--editable', '--outdated', '--format=legacy',
)
- assert WARN_NOCOL in result.stderr, str(result)
assert 'simple (1.0)' not in result.stdout, str(result)
assert os.path.join('src', 'pip-test-package') in result.stdout, (
str(result)
@@ -525,58 +504,90 @@ def test_outdated_pre(script, data):
wheelhouse_path = script.scratch_path / 'wheelhouse'
wheelhouse_path.join('simple-1.1-py2.py3-none-any.whl').write('')
wheelhouse_path.join('simple-2.0.dev0-py2.py3-none-any.whl').write('')
- result = script.pip('list', '--no-index', '--find-links', wheelhouse_path)
+ result = script.pip(
+ 'list', '--no-index', '--find-links', wheelhouse_path,
+ '--format=legacy',
+ )
assert 'simple (1.0)' in result.stdout
- result = script.pip('list', '--no-index', '--find-links', wheelhouse_path,
- '--outdated')
+ result = script.pip(
+ 'list', '--no-index', '--find-links', wheelhouse_path, '--outdated',
+ '--format=legacy',
+ )
assert 'simple (1.0) - Latest: 1.1 [wheel]' in result.stdout
result_pre = script.pip('list', '--no-index',
'--find-links', wheelhouse_path,
- '--outdated', '--pre')
+ '--outdated', '--pre', '--format=legacy')
assert 'simple (1.0) - Latest: 2.0.dev0 [wheel]' in result_pre.stdout
-def test_outdated_pre_columns(script, data):
- """ Test of interaction behavior of --pre and --columns """
+def test_outdated_formats(script, data):
+ """ Test of different outdated formats """
script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
# Let's build a fake wheelhouse
script.scratch_path.join("wheelhouse").mkdir()
wheelhouse_path = script.scratch_path / 'wheelhouse'
wheelhouse_path.join('simple-1.1-py2.py3-none-any.whl').write('')
- wheelhouse_path.join('simple-2.0.dev0-py2.py3-none-any.whl').write('')
- result = script.pip('list', '--no-index', '--find-links', wheelhouse_path)
- assert 'simple (1.0)' in result.stdout
+ result = script.pip(
+ 'list', '--no-index', '--find-links', wheelhouse_path,
+ '--format=freeze',
+ )
+ assert 'simple==1.0' in result.stdout
+
+ # Check legacy
result = script.pip('list', '--no-index', '--find-links', wheelhouse_path,
- '--outdated')
+ '--outdated', '--format=legacy')
assert 'simple (1.0) - Latest: 1.1 [wheel]' in result.stdout
- result_pre = script.pip(
+
+ # Check columns
+ result = script.pip(
'list', '--no-index', '--find-links', wheelhouse_path,
- '--outdated', '--pre', '--columns',
+ '--outdated', '--columns',
)
- assert 'Package' in result_pre.stdout
- assert 'Version' in result_pre.stdout
- assert 'Latest' in result_pre.stdout
- assert 'Type' in result_pre.stdout
-
+ assert 'Package Version Latest Type' in result.stdout
+ assert 'simple 1.0 1.1 wheel' in result.stdout
-def test_outdated_pre_nocolumns(script, data):
- """ Test of interaction behavior of --pre and --no-columns """
- script.pip('install', '-f', data.find_links, '--no-index', 'simple==1.0')
+ # Check freeze
+ result = script.pip(
+ 'list', '--no-index', '--find-links', wheelhouse_path,
+ '--outdated', '--format=freeze',
+ )
+ assert 'simple==1.0' in result.stdout
- # Let's build a fake wheelhouse
- script.scratch_path.join("wheelhouse").mkdir()
- wheelhouse_path = script.scratch_path / 'wheelhouse'
- wheelhouse_path.join('simple-1.1-py2.py3-none-any.whl').write('')
- wheelhouse_path.join('simple-2.0.dev0-py2.py3-none-any.whl').write('')
- result = script.pip('list', '--no-index', '--find-links', wheelhouse_path)
- assert 'simple (1.0)' in result.stdout
- result = script.pip('list', '--no-index', '--find-links', wheelhouse_path,
- '--outdated')
- assert 'simple (1.0) - Latest: 1.1 [wheel]' in result.stdout
+ # Check json
result = script.pip(
- 'list', '--no-index',
- '--find-links', wheelhouse_path,
- '--outdated', '--pre', '--no-columns', expect_stderr=True
+ 'list', '--no-index', '--find-links', wheelhouse_path,
+ '--outdated', '--format=json',
+ )
+ data = json.loads(result.stdout)
+ assert data == [{'name': 'simple', 'version': '1.0',
+ 'latest_version': '1.1', 'latest_filetype': 'wheel'}]
+
+
+def test_list_freeze(script, data):
+ """
+ Test freeze formating of list command
+
+ """
+ script.pip(
+ 'install', '-f', data.find_links, '--no-index', 'simple==1.0',
+ 'simple2==3.0',
+ )
+ result = script.pip('list', '--format=freeze')
+ assert 'simple==1.0' in result.stdout, str(result)
+ assert 'simple2==3.0' in result.stdout, str(result)
+
+
+def test_list_json(script, data):
+ """
+ Test json formating of list command
+
+ """
+ script.pip(
+ 'install', '-f', data.find_links, '--no-index', 'simple==1.0',
+ 'simple2==3.0',
)
- assert WARN_NOCOL in result.stderr, str(result)
+ result = script.pip('list', '--format=json')
+ data = json.loads(result.stdout)
+ assert {'name': 'simple', 'version': '1.0'} in data
+ assert {'name': 'simple2', 'version': '3.0'} in data
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
View Lorry Controller Status