mirror of
https://github.com/ostreedev/ostree.git
synced 2025-03-08 08:58:46 +03:00
Merge pull request #2246 from smcv/pull-summary-sigs-mtime
test-pull-summary-sigs: Set timestamps to serve expected files
This commit is contained in:
commit
81321f2c6b
@ -175,6 +175,8 @@ cd ${test_tmpdir}
|
|||||||
# Reset to the old valid summary and pull to cache it
|
# Reset to the old valid summary and pull to cache it
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
|
||||||
|
touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
|
||||||
|
touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
|
||||||
repo_reinit
|
repo_reinit
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
@ -186,6 +188,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
|
|||||||
# summary signature since it was generated on the server between the
|
# summary signature since it was generated on the server between the
|
||||||
# requests
|
# requests
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
|
||||||
|
touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
|
||||||
if ${OSTREE} --repo=repo pull origin main 2>err.txt; then
|
if ${OSTREE} --repo=repo pull origin main 2>err.txt; then
|
||||||
assert_not_reached "Successful pull with old summary"
|
assert_not_reached "Successful pull with old summary"
|
||||||
fi
|
fi
|
||||||
@ -197,6 +200,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
|
|||||||
|
|
||||||
# Publish correct summary and check that subsequent pull succeeds
|
# Publish correct summary and check that subsequent pull succeeds
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
|
||||||
|
touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
assert_has_file repo/tmp/cache/summaries/origin.sig
|
assert_has_file repo/tmp/cache/summaries/origin.sig
|
||||||
@ -208,6 +212,8 @@ echo "ok pull with signed summary remote old summary"
|
|||||||
# Reset to the old valid summary and pull to cache it
|
# Reset to the old valid summary and pull to cache it
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
|
||||||
|
touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
|
||||||
|
touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
|
||||||
repo_reinit
|
repo_reinit
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
@ -220,6 +226,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
|
|||||||
# is caching the old signature. This should succeed because the cached
|
# is caching the old signature. This should succeed because the cached
|
||||||
# old summary is used.
|
# old summary is used.
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
|
||||||
|
touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
assert_has_file repo/tmp/cache/summaries/origin.sig
|
assert_has_file repo/tmp/cache/summaries/origin.sig
|
||||||
@ -228,6 +235,7 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
|
|||||||
|
|
||||||
# Publish correct signature and check that subsequent pull succeeds
|
# Publish correct signature and check that subsequent pull succeeds
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
|
||||||
|
touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
assert_has_file repo/tmp/cache/summaries/origin.sig
|
assert_has_file repo/tmp/cache/summaries/origin.sig
|
||||||
@ -239,6 +247,8 @@ echo "ok pull with signed summary remote old summary signature"
|
|||||||
# Reset to the old valid summary and pull to cache it
|
# Reset to the old valid summary and pull to cache it
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.1,}
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.1,}
|
||||||
|
touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary
|
||||||
|
touch -t 200101010101 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
|
||||||
repo_reinit
|
repo_reinit
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
@ -273,6 +283,8 @@ cmp repo/tmp/cache/summaries/origin.sig ${test_tmpdir}/ostree-srv/gnomerepo/summ
|
|||||||
# Publish new signature and check that subsequent pull succeeds
|
# Publish new signature and check that subsequent pull succeeds
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary{.2,}
|
||||||
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
|
cp ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig{.2,}
|
||||||
|
touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary
|
||||||
|
touch -t 200202020202 ${test_tmpdir}/ostree-srv/gnomerepo/summary.sig
|
||||||
${OSTREE} --repo=repo pull origin main
|
${OSTREE} --repo=repo pull origin main
|
||||||
assert_has_file repo/tmp/cache/summaries/origin
|
assert_has_file repo/tmp/cache/summaries/origin
|
||||||
assert_has_file repo/tmp/cache/summaries/origin.sig
|
assert_has_file repo/tmp/cache/summaries/origin.sig
|
||||||
|
Loading…
x
Reference in New Issue
Block a user