From 70ebb91aa3106e769a1f7cb285730388e8291c4a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 20 May 2020 10:45:45 -0400 Subject: [PATCH] tests/admin-test: Ensure that commits are 1s apart Otherwise the new check we added there to verify that upgrading without `--allow-downgrade` fails itself fails. See: https://github.com/ostreedev/ostree/pull/2099#issuecomment-629805840 --- tests/admin-test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/admin-test.sh b/tests/admin-test.sh index c716d0a5..55da40c4 100644 --- a/tests/admin-test.sh +++ b/tests/admin-test.sh @@ -300,6 +300,8 @@ echo "ok no duplicate version strings in title" # Test upgrade with and without --override-commit # See https://github.com/GNOME/ostree/pull/147 +sleep 1 +os_repository_new_commit ${CMD_PREFIX} ostree pull --repo=sysroot/ostree/repo --commit-metadata-only --depth=-1 testos:testos/buildmaster/x86_64-runtime head_rev=$(${CMD_PREFIX} ostree rev-parse --repo=sysroot/ostree/repo testos/buildmaster/x86_64-runtime) prev_rev=$(${CMD_PREFIX} ostree rev-parse --repo=sysroot/ostree/repo testos/buildmaster/x86_64-runtime^^^^)