Increase timeout delays in new timeouts isolation test.

Buildfarm member friarbird doesn't like this test as-committed, evidently
because it's so slow that the test framework doesn't reliably notice that
the backend is waiting before the timeout goes off.  (This is not totally
surprising, since friarbird builds with -DCLOBBER_CACHE_ALWAYS.)  Increase
the timeout delay from 1 second to 2 in hopes of resolving that problem.

diff --git a/src/test/isolation/expected/timeouts.out b/src/test/isolation/expected/timeouts.out
index 0ad792ae098d9aa6074bcaddd349239bd201b436..13822005a48fc315588a5f298aa3c80c04d11cd8 100644 (file)
--- a/src/test/isolation/expected/timeouts.out
+++ b/src/test/isolation/expected/timeouts.out
@@ -6,7 +6,7 @@ accountid      balance
 
 checking       600            
 savings        600            
-step sto: SET statement_timeout = 1000;
+step sto: SET statement_timeout = 2000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to statement timeout
@@ -17,7 +17,7 @@ accountid      balance
 
 checking       600            
 savings        600            
-step lto: SET lock_timeout = 1000;
+step lto: SET lock_timeout = 2000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to lock timeout
@@ -28,7 +28,7 @@ accountid      balance
 
 checking       600            
 savings        600            
-step lsto: SET lock_timeout = 1000; SET statement_timeout = 2000;
+step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to lock timeout
@@ -39,35 +39,35 @@ accountid      balance
 
 checking       600            
 savings        600            
-step slto: SET lock_timeout = 2000; SET statement_timeout = 1000;
+step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
 step locktbl: LOCK TABLE accounts; <waiting ...>
 step locktbl: <... completed>
 ERROR:  canceling statement due to statement timeout
 
 starting permutation: wrtbl sto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step sto: SET statement_timeout = 1000;
+step sto: SET statement_timeout = 2000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to statement timeout
 
 starting permutation: wrtbl lto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step lto: SET lock_timeout = 1000;
+step lto: SET lock_timeout = 2000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to lock timeout
 
 starting permutation: wrtbl lsto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step lsto: SET lock_timeout = 1000; SET statement_timeout = 2000;
+step lsto: SET lock_timeout = 2000; SET statement_timeout = 3000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to lock timeout
 
 starting permutation: wrtbl slto update
 step wrtbl: UPDATE accounts SET balance = balance + 100;
-step slto: SET lock_timeout = 2000; SET statement_timeout = 1000;
+step slto: SET lock_timeout = 3000; SET statement_timeout = 2000;
 step update: DELETE FROM accounts WHERE accountid = 'checking'; <waiting ...>
 step update: <... completed>
 ERROR:  canceling statement due to statement timeout

diff --git a/src/test/isolation/specs/timeouts.spec b/src/test/isolation/specs/timeouts.spec
index 000b50c9c92484b29b5ffa95b8c0e0e0bb33f2f1..39bcf0cc819f79d1adf13ba4c4a6c7c6a7a0be9a 100644 (file)
--- a/src/test/isolation/specs/timeouts.spec
+++ b/src/test/isolation/specs/timeouts.spec
@@ -19,10 +19,10 @@ teardown    { ABORT; }
 
 session "s2"
 setup          { BEGIN ISOLATION LEVEL READ COMMITTED; }
-step "sto"     { SET statement_timeout = 1000; }
-step "lto"     { SET lock_timeout = 1000; }
-step "lsto"    { SET lock_timeout = 1000; SET statement_timeout = 2000; }
-step "slto"    { SET lock_timeout = 2000; SET statement_timeout = 1000; }
+step "sto"     { SET statement_timeout = 2000; }
+step "lto"     { SET lock_timeout = 2000; }
+step "lsto"    { SET lock_timeout = 2000; SET statement_timeout = 3000; }
+step "slto"    { SET lock_timeout = 3000; SET statement_timeout = 2000; }
 step "locktbl" { LOCK TABLE accounts; }
 step "update"  { DELETE FROM accounts WHERE accountid = 'checking'; }
 teardown       { ABORT; }