From: Colin Walters <walters@verbum.org>
Date: Fri, 29 Jul 2016 01:06:38 +0000 (-0400)
Subject: tests/delta-crosscheck: Add missing --from
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~49^2~51
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fb0bf27d100943311204c343d458f1fa9c3e6d65;p=ostree.git

tests/delta-crosscheck: Add missing --from

Otherwise we generate a static delta from the *previous* and get
confused.  To make doubly sure, add `--require-static-deltas` to pull.

Closes: #416
Approved by: jlebon
---

diff --git a/manual-tests/static-delta-generate-crosscheck.sh b/manual-tests/static-delta-generate-crosscheck.sh
index fbcbe677..831e0b62 100755
--- a/manual-tests/static-delta-generate-crosscheck.sh
+++ b/manual-tests/static-delta-generate-crosscheck.sh
@@ -45,10 +45,10 @@ validate_delta_options() {
     mkdir testrepo
     ostree --repo=testrepo init --mode=bare-user
     ostree --repo=testrepo remote add --set=gpg-verify=false local file://${repo}
-    ostree --repo=${repo} static-delta generate $@ ${from} ${to}
-    ostree --repo=testrepo pull local ${branch}@${from}
+    ostree --repo=${repo} static-delta generate $@ --from=${from} --to=${to}
+    ostree --repo=testrepo pull --require-static-deltas local ${branch}@${from}
     assert_streq $(ostree --repo=testrepo rev-parse ${branch}) ${from}
-    ostree --repo=testrepo pull local ${branch}
+    ostree --repo=testrepo pull --require-static-deltas local ${branch}
     assert_streq $(ostree --repo=testrepo rev-parse ${branch}) ${to}
     ostree --repo=testrepo fsck
     rm testrepo -rf