Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 49708 invoked from network); 5 Nov 2010 11:13:08 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Nov 2010 11:13:08 -0000 Received: (qmail 22549 invoked by uid 500); 5 Nov 2010 11:13:39 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 22487 invoked by uid 500); 5 Nov 2010 11:13:37 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 22480 invoked by uid 99); 5 Nov 2010 11:13:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 11:13:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED,T_FRT_STOCK2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 11:13:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BC6E323888EA; Fri, 5 Nov 2010 11:12:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1031516 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java Date: Fri, 05 Nov 2010 11:12:22 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101105111222.BC6E323888EA@eris.apache.org> Author: kahatlen Date: Fri Nov 5 11:12:22 2010 New Revision: 1031516 URL: http://svn.apache.org/viewvc?rev=1031516&view=rev Log: DERBY-4885: Reduce lock timeout in SavepointJdbc30Test Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java?rev=1031516&r1=1031515&r2=1031516&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java Fri Nov 5 11:12:22 2010 @@ -31,6 +31,7 @@ import junit.framework.TestSuite; import org.apache.derbyTesting.junit.BaseJDBCTestCase; import org.apache.derbyTesting.junit.CleanDatabaseTestSetup; +import org.apache.derbyTesting.junit.DatabasePropertyTestSetup; import org.apache.derbyTesting.junit.JDBC; import org.apache.derbyTesting.junit.TestConfiguration; @@ -91,8 +92,9 @@ public class SavepointJdbc30Test extends client.addTestSuite(SavepointJdbc30Test.class); suite.addTest(TestConfiguration.clientServerDecorator(TestConfiguration.connectionXADecorator(client))); } - // return suite; - return new CleanDatabaseTestSetup(suite) { + + return new CleanDatabaseTestSetup( + DatabasePropertyTestSetup.setLockTimeouts(suite, 1, 2)) { /** * Creates the database objects used in the test cases. *