Increase deadlock_timeout to 100ms in FK isolation tests

The previous value of 20ms is dangerously close to the time actually
spent just waiting for the deadlock to happen, so on occasion it causes
the test to fail simply because the other session didn't get to run
early enough, not managing to cause the deadlock that needs to be
detected.  With this new value, it's expected that most machines on
normal load will be able to pass the test.

Author: Noah Misch

diff --git a/src/test/isolation/specs/fk-deadlock.spec b/src/test/isolation/specs/fk-deadlock.spec
index b533d77e0bc8524ec24cac3ec63c481d48a9fed6..9f46c6b665c4adcb1c38f5124722668a0c527cfa 100644 (file)
--- a/src/test/isolation/specs/fk-deadlock.spec
+++ b/src/test/isolation/specs/fk-deadlock.spec
@@ -19,7 +19,7 @@ teardown
 }
 
 session "s1"
-setup          { BEGIN; SET deadlock_timeout = '20ms'; }
+setup          { BEGIN; SET deadlock_timeout = '100ms'; }
 step "s1i"     { INSERT INTO child VALUES (1, 1); }
 step "s1u"     { UPDATE parent SET aux = 'bar'; }
 step "s1c"     { COMMIT; }

diff --git a/src/test/isolation/specs/fk-deadlock2.spec b/src/test/isolation/specs/fk-deadlock2.spec
index 5653628cf7c4d6a0d8fe98a4644710ae8b268c54..a8f1516c4ec10cbcff052a61fc9527f4e0040f6c 100644 (file)
--- a/src/test/isolation/specs/fk-deadlock2.spec
+++ b/src/test/isolation/specs/fk-deadlock2.spec
@@ -24,7 +24,7 @@ teardown
 }
 
 session "s1"
-setup          { BEGIN; SET deadlock_timeout = '20ms'; }
+setup          { BEGIN; SET deadlock_timeout = '100ms'; }
 step "s1u1"    { UPDATE A SET Col1 = 1 WHERE AID = 1; }
 step "s1u2"    { UPDATE B SET Col2 = 1 WHERE BID = 2; }
 step "s1c"     { COMMIT; }