mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-23 21:35:26 +03:00
7ed881baa7
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
84 lines
3.4 KiB
Bash
Executable File
84 lines
3.4 KiB
Bash
Executable File
#!/bin/bash
|
||
#
|
||
# Copyright © 2016 Red Hat, Inc.
|
||
# Copyright © 2017 Endless Mobile, Inc.
|
||
#
|
||
# This library is free software; you can redistribute it and/or
|
||
# modify it under the terms of the GNU Lesser General Public
|
||
# License as published by the Free Software Foundation; either
|
||
# version 2 of the License, or (at your option) any later version.
|
||
#
|
||
# This library is distributed in the hope that it will be useful,
|
||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
# Lesser General Public License for more details.
|
||
#
|
||
# You should have received a copy of the GNU Lesser General Public
|
||
# License along with this library; if not, write to the
|
||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
# Boston, MA 02111-1307, USA.
|
||
|
||
set -euo pipefail
|
||
|
||
. $(dirname $0)/libtest.sh
|
||
|
||
echo '1..1'
|
||
|
||
cd ${test_tmpdir}
|
||
mkdir repo
|
||
ostree_repo_init repo --collection-id org.example.Collection
|
||
|
||
mkdir -p tree/root
|
||
touch tree/root/a
|
||
|
||
# Add a few commits
|
||
seq 5 | while read i; do
|
||
echo a >> tree/root/a
|
||
${CMD_PREFIX} ostree --repo=repo commit --branch=test-$i -m test -s test tree
|
||
done
|
||
|
||
# Check that they are all listed, with the repository’s collection ID, in the summary.
|
||
${CMD_PREFIX} ostree --repo=repo summary --update
|
||
|
||
${CMD_PREFIX} ostree --repo=repo summary --view > summary
|
||
assert_file_has_content summary "(org.example.Collection, test-1)$"
|
||
assert_file_has_content summary "(org.example.Collection, test-2)$"
|
||
assert_file_has_content summary "(org.example.Collection, test-3)$"
|
||
assert_file_has_content summary "(org.example.Collection, test-4)$"
|
||
assert_file_has_content summary "(org.example.Collection, test-5)$"
|
||
assert_file_has_content summary "^Collection ID (ostree\.summary\.collection-id): org.example.Collection$"
|
||
|
||
# Test that mirrored branches are listed too.
|
||
${CMD_PREFIX} ostree --repo=repo refs --collections --create=org.example.OtherCollection:test-1-mirror test-1
|
||
${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"
|