summaryrefslogtreecommitdiff
path: root/tests/integration/source-determinism.py
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-01-16 10:42:06 -0500
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-01-16 10:47:21 -0500
commit6286d8209a3db7fcf2b490a55044fa4c2be0c007 (patch)
tree874575658f758a020c74936db2f855ed08c35820 /tests/integration/source-determinism.py
parent4ca37dcd38dc2930bef759a5745c5f158d4b43fe (diff)
downloadbuildstream-6286d8209a3db7fcf2b490a55044fa4c2be0c007.tar.gz
conftest.py: Use different artifact directory for integration tests
To ensure we can run integration tests in parallel, use a tempdir for the artifact cache of each separate integration test run. This makes it possible to run multiple full test runs including integration tests in parallel under detox.
Diffstat (limited to 'tests/integration/source-determinism.py')
-rw-r--r--tests/integration/source-determinism.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py
index fa12593df..a14f3e5b0 100644
--- a/tests/integration/source-determinism.py
+++ b/tests/integration/source-determinism.py
@@ -94,7 +94,7 @@ def test_deterministic_source_umask(cli, tmpdir, datafiles, kind, integration_ca
return f.read()
finally:
os.umask(old_umask)
- cache_dir = os.path.join(integration_cache, 'artifacts')
+ cache_dir = integration_cache.artifacts
cli.remove_artifact_from_cache(project, element_name,
cache_dir=cache_dir)
@@ -156,7 +156,7 @@ def test_deterministic_source_local(cli, tmpdir, datafiles, integration_cache):
with open(os.path.join(checkoutdir, 'ls-l'), 'r') as f:
return f.read()
finally:
- cache_dir = os.path.join(integration_cache, 'artifacts')
+ cache_dir = integration_cache.artifacts
cli.remove_artifact_from_cache(project, element_name,
cache_dir=cache_dir)