From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Nov 2015 15:49:05 +0000 (+0000)
Subject: Increase sqlite_busy_timeout in debpolicy-dbretry
X-Git-Tag: archive/debian/2.0~370
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fc2d3815545ae444fa8037021b12d85812a6f75b;p=dgit.git

Increase sqlite_busy_timeout in debpolicy-dbretry

zealot is very slow and we need to give the other processes time to
rollback and release the lock.
---

diff --git a/debian/changelog b/debian/changelog
index 1b747fe1..93ce3d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ dgit (1.5~~) unstable; urgency=medium
     explicitly in drs-push-rejects test.  This avoids date dependencies
     which can cause that test to fail on fast computers.
   * Remove some spurios .debs from the example_1.0.tar.
+  * Increase sqlite_busy_timeout in debpolicy-dbretry, because
+    zealot is very slow and we need to give the other processes time
+    to rollback and release the lock.
 
  --
 
diff --git a/tests/tests/debpolicy-dbretry b/tests/tests/debpolicy-dbretry
index d9c2ea29..41226913 100755
--- a/tests/tests/debpolicy-dbretry
+++ b/tests/tests/debpolicy-dbretry
@@ -46,7 +46,7 @@ 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