diff options
author | Colin Walters <walters@verbum.org> | 2017-02-10 18:09:16 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-02-17 14:58:25 +0000 |
commit | b5c5003ff6d199c9edd3237658765927597190bf (patch) | |
tree | 1f789d882dbcf546bc3e5cc811a7447f0cc80657 /tests/pull-test.sh | |
parent | 693f7c5f609bbbddd84de054d6edd04a56b5c8d1 (diff) | |
download | ostree-b5c5003ff6d199c9edd3237658765927597190bf.tar.gz |
pull: Fold together deltapart+fallback count for display
It's just simpler, and I'm not sure people are going to care
much about the difference by default.
We already folded in the fallback sizes into the download totals, so folding in
the count makes things consistent; previously you could see e.g.
`3/3 parts, 100MB/150MB` and be confused.
Closes: #678
Approved by: giuseppe
Diffstat (limited to 'tests/pull-test.sh')
-rw-r--r-- | tests/pull-test.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/pull-test.sh b/tests/pull-test.sh index 56b24a0c..693eac06 100644 --- a/tests/pull-test.sh +++ b/tests/pull-test.sh @@ -144,7 +144,8 @@ cd ${test_tmpdir} repo_init ${CMD_PREFIX} ostree --repo=repo pull origin main@${prev_rev} ${CMD_PREFIX} ostree --repo=repo pull --dry-run --require-static-deltas origin main >dry-run-pull.txt -assert_file_has_content dry-run-pull.txt 'Delta update: 0/1 parts' +# Compression can vary, so we support 400-699 +assert_file_has_content dry-run-pull.txt 'Delta update: 0/1 parts, 0 bytes/[456][0-9][0-9] bytes, 455 bytes total uncompressed' rev=$(${CMD_PREFIX} ostree --repo=repo rev-parse origin:main) assert_streq "${prev_rev}" "${rev}" ${CMD_PREFIX} ostree --repo=repo fsck |