diff options
Diffstat (limited to 'tests/sources/zip.py')
| -rw-r--r-- | tests/sources/zip.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/tests/sources/zip.py b/tests/sources/zip.py index b028163f9..41b20eeb6 100644 --- a/tests/sources/zip.py +++ b/tests/sources/zip.py @@ -92,16 +92,6 @@ def test_track_warning(cli, tmpdir, datafiles): assert "Potential man-in-the-middle attack!" in result.stderr -def _list_dir_contents(srcdir): - contents = set() - for _, dirs, files in os.walk(srcdir): - for d in dirs: - contents.add(d) - for f in files: - contents.add(f) - return contents - - # Test that a staged checkout matches what was tarred up, with the default first subdir @pytest.mark.datafiles(os.path.join(DATA_DIR, 'fetch')) def test_stage_default_basedir(cli, tmpdir, datafiles): @@ -125,8 +115,8 @@ def test_stage_default_basedir(cli, tmpdir, datafiles): # Check that the content of the first directory is checked out (base-dir: '*') original_dir = os.path.join(str(datafiles), "content", "a") - original_contents = _list_dir_contents(original_dir) - checkout_contents = _list_dir_contents(checkoutdir) + original_contents = cli.list_dir_contents(original_dir) + checkout_contents = cli.list_dir_contents(checkoutdir) assert(checkout_contents == original_contents) @@ -153,8 +143,8 @@ def test_stage_no_basedir(cli, tmpdir, datafiles): # Check that the full content of the tarball is checked out (base-dir: '') original_dir = os.path.join(str(datafiles), "content") - original_contents = _list_dir_contents(original_dir) - checkout_contents = _list_dir_contents(checkoutdir) + original_contents = cli.list_dir_contents(original_dir) + checkout_contents = cli.list_dir_contents(checkoutdir) assert(checkout_contents == original_contents) @@ -181,6 +171,6 @@ def test_stage_explicit_basedir(cli, tmpdir, datafiles): # Check that the content of the first directory is checked out (base-dir: '*') original_dir = os.path.join(str(datafiles), "content", "a") - original_contents = _list_dir_contents(original_dir) - checkout_contents = _list_dir_contents(checkoutdir) + original_contents = cli.list_dir_contents(original_dir) + checkout_contents = cli.list_dir_contents(checkoutdir) assert(checkout_contents == original_contents) |