[tests/functional/cache] Rewrite all of the pip cache {list,remove} t…

…ests.

tests/functional/test_cache.py

@@ -1,4 +1,5 @@
 import os
+import re
 from glob import glob
 
 import pytest
@@ -37,6 +38,8 @@ def populate_wheel_cache(wheel_cache_dir):
     files = [
         ('yyy-1.2.3', os.path.join(destination, 'yyy-1.2.3-py3-none-any.whl')),
         ('zzz-4.5.6', os.path.join(destination, 'zzz-4.5.6-py3-none-any.whl')),
+        ('zzz-4.5.7', os.path.join(destination, 'zzz-4.5.7-py3-none-any.whl')),
+        ('zzz-7.8.9', os.path.join(destination, 'zzz-7.8.9-py3-none-any.whl')),
     ]
 
     for _name, filename in files:
@@ -46,6 +49,38 @@ def populate_wheel_cache(wheel_cache_dir):
     return files
 
 
+def list_matches_wheel(wheel_name, lines):
+    """Returns True if any line in `lines`, which should be the output of
+    a `pip cache list` call, matches `wheel_name`.
+
+    E.g., If wheel_name is `foo-1.2.3` it searches for a line starting with
+          `- foo-1.2.3-py3-none-any.whl `."""
+    expected = ' - {}-py3-none-any.whl '.format(wheel_name)
+    return any(map(lambda l: l.startswith(expected), lines))
+
+
+@pytest.fixture
+def remove_matches_wheel(wheel_cache_dir):
+    """Returns True if any line in `lines`, which should be the output of
+    a `pip cache remove`/`pip cache purge` call, matches `wheel_name`.
+
+    E.g., If wheel_name is `foo-1.2.3`, it searches for a line equal to
+    `Removed <wheel cache dir>/arbitrary/pathname/foo-1.2.3-py3-none-any.whl`.
+    """
+
+    def _remove_matches_wheel(wheel_name, lines):
+        wheel_filename = '{}-py3-none-any.whl'.format(wheel_name)
+
+        # The "/arbitrary/pathname/" bit is an implementation detail of how
+        # the `populate_wheel_cache` fixture is implemented.
+        expected = 'Removed {}/arbitrary/pathname/{}'.format(
+            wheel_cache_dir, wheel_filename,
+        )
+        return expected in lines
+
+    return _remove_matches_wheel
+
+
 @pytest.mark.usefixtures("populate_wheel_cache")
 def test_cache_info(script, wheel_cache_dir, wheel_cache_files):
     result = script.pip('cache', 'info')
@@ -57,37 +92,86 @@ def test_cache_info(script, wheel_cache_dir, wheel_cache_files):
 
 @pytest.mark.usefixtures("populate_wheel_cache")
 def test_cache_list(script):
+    """Running `pip cache list` should return exactly what the
+    populate_wheel_cache fixture adds."""
     result = script.pip('cache', 'list')
-
-    assert 'yyy-1.2.3' in result.stdout
-    assert 'zzz-4.5.6' in result.stdout
+    lines = result.stdout.splitlines()
+    assert list_matches_wheel('yyy-1.2.3', lines)
+    assert list_matches_wheel('zzz-4.5.6', lines)
+    assert list_matches_wheel('zzz-4.5.7', lines)
+    assert list_matches_wheel('zzz-7.8.9', lines)
 
 
 def test_cache_list_too_many_args(script):
+    """Passing `pip cache list` too many arguments should cause an error."""
     script.pip('cache', 'list', 'aaa', 'bbb',
                expect_error=True)
 
 
 @pytest.mark.usefixtures("populate_wheel_cache")
-def test_cache_list_with_pattern(script):
-    result = script.pip('cache', 'list', 'zzz')
-    assert 'yyy-1.2.3' not in result.stdout
-    assert 'zzz-4.5.6' in result.stdout
+def test_cache_list_name_match(script):
+    """Running `pip cache list zzz` should list zzz-4.5.6, zzz-4.5.7,
+    zzz-7.8.9, but nothing else."""
+    result = script.pip('cache', 'list', 'zzz', '--verbose')
+    lines = result.stdout.splitlines()
+
+    assert not list_matches_wheel('yyy-1.2.3', lines)
+    assert list_matches_wheel('zzz-4.5.6', lines)
+    assert list_matches_wheel('zzz-4.5.7', lines)
+    assert list_matches_wheel('zzz-7.8.9', lines)
 
 
 @pytest.mark.usefixtures("populate_wheel_cache")
-def test_cache_remove(script):
+def test_cache_list_name_and_version_match(script):
+    """Running `pip cache list zzz-4.5.6` should list zzz-4.5.6, but
+    nothing else."""
+    result = script.pip('cache', 'list', 'zzz-4.5.6', '--verbose')
+    lines = result.stdout.splitlines()
+
+    assert not list_matches_wheel('yyy-1.2.3', lines)
+    assert list_matches_wheel('zzz-4.5.6', lines)
+    assert not list_matches_wheel('zzz-4.5.7', lines)
+    assert not list_matches_wheel('zzz-7.8.9', lines)
+
+
+@pytest.mark.usefixture("populate_wheel_cache")
+def test_cache_remove_no_arguments(script):
+    """Running `pip cache remove` with no arguments should cause an error."""
     script.pip('cache', 'remove', expect_error=True)
-    result = script.pip('cache', 'remove', 'zzz', '--verbose')
-    assert 'yyy-1.2.3' not in result.stdout
-    assert 'zzz-4.5.6' in result.stdout
 
 
 def test_cache_remove_too_many_args(script):
+    """Passing `pip cache remove` too many arguments should cause an error."""
     script.pip('cache', 'remove', 'aaa', 'bbb',
                expect_error=True)
 
 
+@pytest.mark.usefixtures("populate_wheel_cache")
+def test_cache_remove_name_match(script, remove_matches_wheel):
+    """Running `pip cache remove zzz` should remove zzz-4.5.6 and zzz-7.8.9,
+    but nothing else."""
+    result = script.pip('cache', 'remove', 'zzz', '--verbose')
+    lines = result.stdout.splitlines()
+
+    assert not remove_matches_wheel('yyy-1.2.3', lines)
+    assert remove_matches_wheel('zzz-4.5.6', lines)
+    assert remove_matches_wheel('zzz-4.5.7', lines)
+    assert remove_matches_wheel('zzz-7.8.9', lines)
+
+
+@pytest.mark.usefixtures("populate_wheel_cache")
+def test_cache_remove_name_and_version_match(script, remove_matches_wheel):
+    """Running `pip cache remove zzz-4.5.6` should remove zzz-4.5.6, but
+    nothing else."""
+    result = script.pip('cache', 'remove', 'zzz-4.5.6', '--verbose')
+    lines = result.stdout.splitlines()
+
+    assert not remove_matches_wheel('yyy-1.2.3', lines)
+    assert remove_matches_wheel('zzz-4.5.6', lines)
+    assert not remove_matches_wheel('zzz-4.5.7', lines)
+    assert not remove_matches_wheel('zzz-7.8.9', lines)
+
+
 @pytest.mark.usefixtures("populate_wheel_cache")
 def test_cache_purge(script):
     result = script.pip('cache', 'purge', 'aaa', '--verbose',