[postgis] 01/01: Add patch relax-test-timing-constraints.patch

[Markus Wanner]

This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to branch master
in repository postgis.

commit 881de4390d99f29d765f20185d59cccdc504bf5f
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri Jan 15 09:15:28 2016 +0100

    Add patch relax-test-timing-constraints.patch
---
 debian/changelog                                   |  7 ++-
 debian/patches/relax-test-timing-constraints.patch | 70 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 84b44c5..741a7ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 postgis (2.2.1+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Bas Couwenberg ]
   * Add patch by Helge Deller to fix wkb_output test failure on hppa & mips.
     (closes: #810859)
 
- -- Bas Couwenberg <sebastic at debian.org>  Tue, 12 Jan 2016 23:34:26 +0100
+  [ Markus Wanner ]
+  * Add patch relax-test-timing-constraints.patch to increase chances of
+    tests passing on the pgapt infrastructure.
+
+ -- Markus Wanner <markus at bluegap.ch>  Thu, 14 Jan 2016 20:09:42 +0100
 
 postgis (2.2.1+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/patches/relax-test-timing-constraints.patch b/debian/patches/relax-test-timing-constraints.patch
new file mode 100644
index 0000000..ab1f515
--- /dev/null
+++ b/debian/patches/relax-test-timing-constraints.patch
@@ -0,0 +1,70 @@
+Description: Relax timing constraints for some tests.
+ With a statement_timeout of 100ms, increase the allowed _timecheck interval
+ from 200ms or 250ms to 500ms. This should increase chances of tests passing
+ even on busy or slow systems.
+Author: Markus Wanner <markus at bluegap.ch>
+Forwarded: no
+
+--- a/regress/interrupt.sql
++++ b/regress/interrupt.sql
+@@ -24,7 +24,7 @@
+ SET statement_timeout TO 100;
+ -- would run for many seconds if uninterruptible...
+ SELECT ST_Segmentize(ST_MakeLine(ST_Point(4,39), ST_Point(1,41)), 1e-100);
+-SELECT _timecheck('segmentize', '250ms');
++SELECT _timecheck('segmentize', '500ms');
+ SET statement_timeout TO 0;
+ -- Not affected by old timeout
+ SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2));
+--- a/regress/interrupt_buffer.sql
++++ b/regress/interrupt_buffer.sql
+@@ -36,7 +36,7 @@
+ --( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo;
+ -- it may take some more to interrupt st_buffer, see
+ -- https://travis-ci.org/postgis/postgis/builds/40211116#L2222-L2223
+-SELECT _timecheck('buffer', '200ms');
++SELECT _timecheck('buffer', '500ms');
+ 
+ -- Not affected by old timeout
+ SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1));
+--- a/regress/interrupt_relate.sql
++++ b/regress/interrupt_relate.sql
+@@ -36,30 +36,30 @@
+ SET statement_timeout TO 100;
+ 
+ select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('contains', '200ms');
++SELECT _timecheck('contains', '500ms');
+ 
+ select ST_Covers(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('covers', '200ms');
++SELECT _timecheck('covers', '500ms');
+ 
+ select ST_CoveredBy(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('coveredby', '200ms');
++SELECT _timecheck('coveredby', '500ms');
+ 
+ select ST_Crosses(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('crosses', '200ms');
++SELECT _timecheck('crosses', '500ms');
+ 
+ -- NOTE: we're reversing one of the operands to avoid the
+ --       short-circuit described in #3226
+ select ST_Equals(g,st_reverse(g)) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('equals', '200ms');
++SELECT _timecheck('equals', '500ms');
+ 
+ select ST_Intersects(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('intersects', '200ms');
++SELECT _timecheck('intersects', '500ms');
+ 
+ select ST_Overlaps(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('overlaps', '200ms');
++SELECT _timecheck('overlaps', '500ms');
+ 
+ select ST_Relate(g,g) from _inputs WHERE id = 1; -- 6+ seconds
+-SELECT _timecheck('relate', '200ms');
++SELECT _timecheck('relate', '500ms');
+ 
+ 
+ DROP FUNCTION _timecheck(text, interval);
diff --git a/debian/patches/series b/debian/patches/series
index 74b8328..138cd0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 link-liblwgeom
 hppa.patch
+relax-test-timing-constraints.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git