[buildstream] 13/20: import_cas.py: Parametrize to allow different overlay combinations

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

root pushed a commit to branch jmac/virtual_directory_tests
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 14bcd4317dde8625aea11ca7c89e1984b93354bc
Author: Jim MacArthur <ji...@codethink.co.uk>
AuthorDate: Mon Sep 17 16:12:20 2018 +0100

    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 176e019..f102b22 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"))