From b2df9f81d70dd1092591a694625863166276ce73 Mon Sep 17 00:00:00 2001 From: clime Date: Aug 18 2018 20:27:22 +0000 Subject: [prunerepo] fix test non-determinism --- diff --git a/prunerepo/tests/base/test.sh b/prunerepo/tests/base/test.sh index 5711935..d2e5e2e 100755 --- a/prunerepo/tests/base/test.sh +++ b/prunerepo/tests/base/test.sh @@ -66,10 +66,11 @@ setup repomdlastmodtime1=`stat -c '%Y' $testrepo/repodata/repomd.xml` run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die +run 'sleep 1' runcmd --nocreaterepo . run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' && die -run 'sleep 1 && [[ $repomdlastmodtime1 == `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' || die +run '[[ $repomdlastmodtime1 == `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' || die echo success. @@ -80,10 +81,11 @@ setup repomdlastmodtime1=`stat -c '%Y' $testrepo/repodata/repomd.xml` run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die +run 'sleep 1' runcmd --days 999999999 . run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die -run 'sleep 1 && [[ $repomdlastmodtime1 == `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' || die +run '[[ $repomdlastmodtime1 == `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' || die echo success. @@ -94,10 +96,11 @@ setup repomdlastmodtime1=`stat -c '%Y' $testrepo/repodata/repomd.xml` run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die +run 'sleep 1' runcmd --alwayscreaterepo --days 999999999 . run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die -run 'sleep 1 && [[ $repomdlastmodtime1 < `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' || die +run '[[ $repomdlastmodtime1 < `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' || die echo success. @@ -108,15 +111,17 @@ setup repomdlastmodtime1=`stat -c '%Y' $testrepo/repodata/repomd.xml` run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die +run 'sleep 1' runcmd --alwayscreaterepo --nocreaterepo --days 999999999 . run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' || die -run 'sleep 1 && [[ $repomdlastmodtime1 < `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' && die +run '[[ $repomdlastmodtime1 < `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' && die +run 'sleep 1' runcmd --alwayscreaterepo --nocreaterepo . run '[[ `listpkgsbyfs` == `listpkgsbyrepo` ]]' && die -run 'sleep 1 && [[ $repomdlastmodtime1 < `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' && die +run '[[ $repomdlastmodtime1 < `stat -c '%Y' $testrepo/repodata/repomd.xml` ]]' && die echo success.