diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2013-03-17 23:00:44 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2013-03-17 23:01:20 -0400 |
| commit | 4c855750fc0ba9bd30fa397eafbfee354908bbca (patch) | |
| tree | 29eb5f7411727d6d8c4c79a9e2052bcdb9a5c99f | |
| parent | 05f3f9c7b2922b2a064418b5cd87b372d1b73412 (diff) | |
| download | postgresql-4c855750fc0ba9bd30fa397eafbfee354908bbca.tar.gz | |
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.
| -rw-r--r-- | src/test/isolation/expected/timeouts.out | 16 | ||||
| -rw-r--r-- | src/test/isolation/specs/timeouts.spec | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/test/isolation/expected/timeouts.out b/src/test/isolation/expected/timeouts.out index 0ad792ae09..13822005a4 100644 --- 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 000b50c9c9..39bcf0cc81 100644 --- 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; } |