From 956618a188b3da591694ed3172ebf1622294bd16 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 3 May 2018 21:32:56 -0400
Subject: [PATCH] tests: Tweak staged-deploy test to be faster

Work around https://github.com/ostreedev/ostree/issues/1569

Closes: #1573
Approved by: jlebon
---
 tests/installed/destructive/staged-deploy.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/installed/destructive/staged-deploy.yml b/tests/installed/destructive/staged-deploy.yml
index f946e139..3720d2d6 100644
--- a/tests/installed/destructive/staged-deploy.yml
+++ b/tests/installed/destructive/staged-deploy.yml
@@ -3,7 +3,10 @@
 
 - name: Write staged-deploy commit
   shell: |
-    ostree --repo=/ostree/repo commit --parent="${commit}" -b staged-deploy --tree=ref="${commit}" --no-bindings
+    cd /ostree/repo/tmp
+    # https://github.com/ostreedev/ostree/issues/1569
+    ostree checkout -H ${commit} t
+    ostree commit --no-bindings --parent="${commit}" -b staged-deploy -I --consume t
     newcommit=$(ostree rev-parse staged-deploy)
     orig_mtime=$(stat -c '%.Y' /sysroot/ostree/deploy)
     ostree admin deploy --stage staged-deploy
@@ -51,7 +54,7 @@
   shell: |
     ostree admin deploy --stage staged-deploy
     test -f /run/ostree/staged-deployment
-    ostree --repo=/ostree/repo commit --parent="${commit}" -b nonstaged-deploy --tree=ref="${commit}" --no-bindings
+    ostree --repo=/ostree/repo refs --create nonstaged-deploy "${commit}"
     ostree admin deploy nonstaged-deploy
     ostree admin status > status.txt
     grep -vqFe '(staged)' status.txt