db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1563032 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
Date Fri, 31 Jan 2014 01:59:27 GMT
Author: myrnavl
Date: Fri Jan 31 01:59:27 2014
New Revision: 1563032

URL: http://svn.apache.org/r1563032
Log:
DERBY-6437; ConstraintCharachteristicsTest testLockingWithRollback or testLockingWithCommit
failing on trunk with AssertionFailedError - isolation levels ...
   adjusting the derby.locks.waitTimeout.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java?rev=1563032&r1=1563031&r2=1563032&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
Fri Jan 31 01:59:27 2014
@@ -93,9 +93,26 @@ public class ConstraintCharacteristicsTe
         suite.addTest(baseSuite(nameRoot + ":embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(
                 baseSuite(nameRoot + ":client")));
+        suite.addTest(restSuite(nameRoot + ":embedded"));
+        suite.addTest(TestConfiguration.clientServerDecorator(
+                restSuite(nameRoot + ":client")));
         return suite;
     }
 
+    // this suite holds tests that require a more optimal 
+    // locks.waitTimeout setting.
+    private static Test restSuite(String name) {
+        TestSuite suite = new TestSuite(name);
+        suite.addTest(new ConstraintCharacteristicsTest(
+                "testLocking"));
+        Properties systemProperties = new Properties();
+        systemProperties.setProperty(
+            "derby.locks.waitTimeout", Integer.toString(WAIT_TIMEOUT_DURATION));
+
+        return new SupportFilesSetup(
+                new SystemPropertyTestSetup(suite, systemProperties, true));
+    }
+    
     private static Test baseSuite(String name) {
         TestSuite suite = new TestSuite(name);
 
@@ -106,8 +123,6 @@ public class ConstraintCharacteristicsTe
         suite.addTest(new ConstraintCharacteristicsTest(
                       "testCompressTable"));
         suite.addTest(new ConstraintCharacteristicsTest(
-                      "testLocking"));
-        suite.addTest(new ConstraintCharacteristicsTest(
                       "testLockingWithCommit"));
         suite.addTest(new ConstraintCharacteristicsTest(
                       "testLockingWithRollback"));
@@ -138,7 +153,7 @@ public class ConstraintCharacteristicsTe
 
         Properties systemProperties = new Properties();
         systemProperties.setProperty(
-            "derby.locks.waitTimeout", Integer.toString(WAIT_TIMEOUT_DURATION));
+            "derby.locks.waitTimeout", Integer.toString(500));
 
         return new SupportFilesSetup(
                 new SystemPropertyTestSetup(suite, systemProperties, true));



Mime
View raw message