diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-01 05:56:37 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-03-01 05:56:37 +0000 |
| commit | fc2b42d63ac4ec1bc7727a1f7705613305060572 (patch) | |
| tree | 7909066a6023a34be825db63184b52b1a6b1dd17 /tests | |
| parent | 348f04e7a80338de1b9cc911e48263d8cd31be65 (diff) | |
| parent | f3a63faf7ea88ed95831aa26fe7e9cfa7960d7e3 (diff) | |
| download | buildstream-fc2b42d63ac4ec1bc7727a1f7705613305060572.tar.gz | |
Merge branch 'juerg/lazy-directory-digest' into 'master'
_casbaseddirectory.py: Calculate directory digest lazily
See merge request BuildStream/buildstream!1188
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/artifactcache/push.py | 5 | ||||
| -rw-r--r-- | tests/internals/storage_vdir_import.py | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/artifactcache/push.py b/tests/artifactcache/push.py index 0a39f5344..a7b8bdbd9 100644 --- a/tests/artifactcache/push.py +++ b/tests/artifactcache/push.py @@ -233,12 +233,13 @@ def _test_push_directory(user_config_file, project_dir, artifact_digest, queue): if cas.has_push_remotes(): # Create a CasBasedDirectory from local CAS cache content - directory = CasBasedDirectory(context.artifactcache.cas, ref=artifact_digest) + directory = CasBasedDirectory(context.artifactcache.cas, digest=artifact_digest) # Push the CasBasedDirectory object cas.push_directory(project, directory) - queue.put(directory.ref.hash) + digest = directory._get_digest() + queue.put(digest.hash) else: queue.put("No remote configured") diff --git a/tests/internals/storage_vdir_import.py b/tests/internals/storage_vdir_import.py index ee346ea58..268bfb21f 100644 --- a/tests/internals/storage_vdir_import.py +++ b/tests/internals/storage_vdir_import.py @@ -113,7 +113,8 @@ def file_contents_are(path, contents): def create_new_casdir(root_number, cas_cache, tmpdir): d = CasBasedDirectory(cas_cache) d.import_files(os.path.join(tmpdir, "content", "root{}".format(root_number))) - assert d.ref.hash != empty_hash_ref + digest = d._get_digest() + assert digest.hash != empty_hash_ref return d @@ -175,7 +176,7 @@ def _import_test(tmpdir, original, overlay, generator_function, verify_contents= duplicate_cas = create_new_casdir(original, cas_cache, tmpdir) - assert duplicate_cas.ref.hash == d.ref.hash + assert duplicate_cas._get_digest().hash == d._get_digest().hash d2 = create_new_casdir(overlay, cas_cache, tmpdir) d.import_files(d2) @@ -213,7 +214,7 @@ def _import_test(tmpdir, original, overlay, generator_function, verify_contents= duplicate_cas.import_files(roundtrip_dir) - assert duplicate_cas.ref.hash == d.ref.hash + assert duplicate_cas._get_digest().hash == d._get_digest().hash # It's possible to parameterize on both original and overlay values, |