diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2017-08-21 17:08:12 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-24 19:57:33 +0000 |
| commit | 7ed881baa75192521fa972fa702c66470dc0a225 (patch) | |
| tree | 7a9894b29017f040486928c215e65a860b229bd4 /tests/test-summary-collections.sh | |
| parent | 95bac299e54020e6cc795b126deefc8c2c7820f4 (diff) | |
| download | ostree-7ed881baa75192521fa972fa702c66470dc0a225.tar.gz | |
lib/repo-refs: Include remote refs when using collections
When working with collections it can be useful to see remote refs rather
than just local and mirrored ones. This commit changes the "ostree refs
-c" output to include remote refs, and includes remote refs with
collection IDs in summary file generation as well. The former behavior
is consistent with how "ostree refs" works, and the latter behavior is
useful in facilitating P2P updates even when mirrors haven't been
configured.
To accomplish this, OstreeRepoListRefsExtFlags was extended with an
EXCLUDE_REMOTES flag. This was done rather than an INCLUDE_REMOTES flag
so that existing calls to ostree_repo_list_refs_ext continue to have the
same behavior. This flag was added to ostree_repo_list_collection_refs
(which is an experimental API break).
Also, add unit tests for the "refs -c" and summary file behavior, and
update relevant tests.
Closes: #1069
Approved by: cgwalters
Diffstat (limited to 'tests/test-summary-collections.sh')
| -rwxr-xr-x | tests/test-summary-collections.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/test-summary-collections.sh b/tests/test-summary-collections.sh index 989e63e8..d12100ba 100755 --- a/tests/test-summary-collections.sh +++ b/tests/test-summary-collections.sh @@ -55,4 +55,29 @@ ${CMD_PREFIX} ostree --repo=repo summary --update ${CMD_PREFIX} ostree --repo=repo summary --view > summary assert_file_has_content summary "(org.example.OtherCollection, test-1-mirror)$" +# Test that remote refs are listed, but only if they have collection IDs +cd ${test_tmpdir} +mkdir collection-repo +ostree_repo_init collection-repo --collection-id org.example.RemoteCollection +mkdir -p adir +${CMD_PREFIX} ostree --repo=collection-repo commit --branch=rcommit -m rcommit -s rcommit adir +${CMD_PREFIX} ostree --repo=repo remote add --no-gpg-verify --collection-id org.example.RemoteCollection collection-repo-remote "file://${test_tmpdir}/collection-repo" +${CMD_PREFIX} ostree --repo=repo pull collection-repo-remote rcommit +${CMD_PREFIX} ostree --repo=repo summary --update + +${CMD_PREFIX} ostree --repo=repo summary --view > summary +assert_file_has_content summary "(org.example.RemoteCollection, rcommit)$" + +cd ${test_tmpdir} +mkdir no-collection-repo +ostree_repo_init no-collection-repo +mkdir -p adir2 +${CMD_PREFIX} ostree --repo=no-collection-repo commit --branch=rcommit2 -m rcommit2 -s rcommit2 adir2 +${CMD_PREFIX} ostree --repo=repo remote add --no-gpg-verify no-collection-repo-remote "file://${test_tmpdir}/no-collection-repo" +${CMD_PREFIX} ostree --repo=repo pull no-collection-repo-remote rcommit2 +${CMD_PREFIX} ostree --repo=repo summary --update + +${CMD_PREFIX} ostree --repo=repo summary --view > summary +assert_not_file_has_content summary "rcommit2" + echo "ok summary collections" |