From e2234e854d1900f02064d35351b331861278b6e2 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 4 Mar 2016 10:53:47 -0500 Subject: [PATCH] tests/basic: Fix race in timestamp test %Z only uses seconds, so it's possible that we did the commit in the same second, which made this test racy. - Switch to full nanosecond precision using '%.Y' so it always differs - Fix the inverted `cmp` usage - Add a missing `ok` --- tests/basic-test.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/basic-test.sh b/tests/basic-test.sh index c7ff0460..8acec1c2 100755 --- a/tests/basic-test.sh +++ b/tests/basic-test.sh @@ -19,7 +19,7 @@ set -euo pipefail -echo "1..49" +echo "1..50" $OSTREE checkout test2 checkout-test2 echo "ok checkout" @@ -434,10 +434,12 @@ rm -rf test2-checkout mkdir -p test2-checkout cd test2-checkout touch blah -stat --printf="%Z\n" ${test_tmpdir}/repo > ${test_tmpdir}/timestamp-orig.txt +stat --printf="%.Y\n" ${test_tmpdir}/repo > ${test_tmpdir}/timestamp-orig.txt $OSTREE commit -b test2 -s "Should bump the mtime" -stat --printf="%Z\n" ${test_tmpdir}/repo > ${test_tmpdir}/timestamp-new.txt +stat --printf="%.Y\n" ${test_tmpdir}/repo > ${test_tmpdir}/timestamp-new.txt cd .. -if ! cmp timestamp-{orig,new}.txt; then +if cmp timestamp-{orig,new}.txt; then assert_not_reached "failed to update mtime on repo" fi + +echo "ok mtime updated"