X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fdebpolicy-dbretry;h=a9f2334121c841ca43351eeb111d2c6fec76335f;hp=e24175eb817d49317d9c79cd3b3d68089a75445b;hb=1951e44b06b3e179b508bcd139d8758c250e35e2;hpb=520d2b03770aeb7be9b63fbdddb9ad896d535732 diff --git a/tests/tests/debpolicy-dbretry b/tests/tests/debpolicy-dbretry index e24175eb..a9f23341 100755 --- a/tests/tests/debpolicy-dbretry +++ b/tests/tests/debpolicy-dbretry @@ -22,7 +22,7 @@ t-commit 'Make something to autotaint' t-dgit build t-dgit push --new -autotaint=`t-git-get-ref "refs/tags/debian/$v"` +autotaint=`t-git-get-ref "refs/tags/$tagpfx/$v"` git reset --hard start t-commit 'Thing which will autotaint' @@ -40,13 +40,13 @@ echo >&3 ".output $taintsout" echo >&3 'select * from taints;'; echo >&3 'create table dummy (x text);' -while ! grep $taint $taintsout; do sleep 0.1; done - t-dgit build -DGIT_DRS_RPD_TEST_DBLOOP_HOOK=' +while ! grep $taint $taintsout; do sleep 0.1; done + +DGIT_RPD_TEST_DBLOOP_HOOK=' print STDERR "DBLOOP HOOK $sleepy\n"; - $poldbh->sqlite_busy_timeout(500); + $poldbh->sqlite_busy_timeout(2500); if ($sleepy > 2) { system '\'' set -ex @@ -64,4 +64,4 @@ ls $tmp/sqlite3.rolled-back t-policy-admin list-taints | tee $tmp/taints-list | grep $autotaint -echo ok. +t-ok