diff options
| author | Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk> | 2019-01-23 15:59:04 +0000 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2019-02-19 17:05:17 +0000 |
| commit | c7f76268cc6f35209587749df85f3af9cfbaabf1 (patch) | |
| tree | 5743ab0d84c47ba28fb5659acd266fadca7d82fd /tests/integration/source-determinism.py | |
| parent | 52c0c185d964bf696e320be97663c412e020b427 (diff) | |
| download | buildstream-c7f76268cc6f35209587749df85f3af9cfbaabf1.tar.gz | |
cachedir: add new dir option that's default root to other dirs
Makes artifactdir and builddir obsolete.
Fixes #870
Diffstat (limited to 'tests/integration/source-determinism.py')
| -rw-r--r-- | tests/integration/source-determinism.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/integration/source-determinism.py b/tests/integration/source-determinism.py index f7b2bf2ac..0b69346cd 100644 --- a/tests/integration/source-determinism.py +++ b/tests/integration/source-determinism.py @@ -31,7 +31,7 @@ def create_test_directory(*path, mode=0o644): @pytest.mark.datafiles(DATA_DIR) @pytest.mark.parametrize("kind", [(kind) for kind in ALL_REPO_KINDS] + ['local']) @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox') -def test_deterministic_source_umask(cli, tmpdir, datafiles, kind, integration_cache): +def test_deterministic_source_umask(cli, tmpdir, datafiles, kind): project = str(datafiles) element_name = 'list.bst' element_path = os.path.join(project, 'elements', element_name) @@ -94,9 +94,7 @@ def test_deterministic_source_umask(cli, tmpdir, datafiles, kind, integration_ca return f.read() finally: os.umask(old_umask) - cache_dir = integration_cache.artifacts - cli.remove_artifact_from_cache(project, element_name, - cache_dir=cache_dir) + cli.remove_artifact_from_cache(project, element_name) assert get_value_for_umask(0o022) == get_value_for_umask(0o077) @@ -104,7 +102,7 @@ def test_deterministic_source_umask(cli, tmpdir, datafiles, kind, integration_ca @pytest.mark.integration @pytest.mark.datafiles(DATA_DIR) @pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox') -def test_deterministic_source_local(cli, tmpdir, datafiles, integration_cache): +def test_deterministic_source_local(cli, tmpdir, datafiles): """Only user rights should be considered for local source. """ project = str(datafiles) @@ -156,8 +154,6 @@ 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 = integration_cache.artifacts - cli.remove_artifact_from_cache(project, element_name, - cache_dir=cache_dir) + cli.remove_artifact_from_cache(project, element_name) assert get_value_for_mask(0o7777) == get_value_for_mask(0o0700) |