change test lockTimeout

h2/src/test/org/h2/test/TestAll.java

@@ -371,7 +371,7 @@ java org.h2.test.TestAll timer
     /**
      * The lock timeout to use
      */
-    public int lockTimeout = 5000;
+    public int lockTimeout = 50;
 
     /**
      * If the transaction log should be kept small (that is, the log should be

h2/src/test/org/h2/test/TestBase.java

@@ -306,7 +306,7 @@ public abstract class TestBase {
         } else if (config.throttle > 0) {
             url = addOption(url, "THROTTLE", "" + config.throttle);
         }
-        url = addOption(url, "LOCK_TIMEOUT", "" + config.lockTimeout);
+        url = addOption(url, "LOCK_TIMEOUT", String.valueOf(config.lockTimeout * (config.mvStore ? 100 : 1)));
         if (config.diskUndo && admin) {
             url = addOption(url, "MAX_MEMORY_UNDO", "3");
         }