From 14bcd4317dde8625aea11ca7c89e1984b93354bc Mon Sep 17 00:00:00 2001 From: Jim MacArthur Date: Mon, 17 Sep 2018 16:12:20 +0100 Subject: import_cas.py: Parametrize to allow different overlay combinations --- tests/storage/import_cas.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/storage/import_cas.py b/tests/storage/import_cas.py index 176e01914..f102b22b4 100644 --- a/tests/storage/import_cas.py +++ b/tests/storage/import_cas.py @@ -65,15 +65,16 @@ def create_new_vdir(root_number, fake_context, tmpdir): return d -def test_cas_import(cli, tmpdir): +@pytest.mark.parametrize("roots", [(1, 2), (2, 1)]) +def test_cas_import(cli, tmpdir, roots): fake_context = FakeContext() fake_context.artifactdir = tmpdir # Create some fake content generate_import_roots(tmpdir) - overlay = 2 + (original, overlay) = roots - d = create_new_vdir(1, fake_context, tmpdir) + d = create_new_vdir(original, fake_context, tmpdir) d2 = create_new_vdir(overlay, fake_context, tmpdir) d.import_files(d2) d.export_files(os.path.join(tmpdir, "output")) -- cgit v1.2.1