Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 54409 invoked from network); 4 Jun 2007 14:45:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jun 2007 14:45:29 -0000 Received: (qmail 92094 invoked by uid 500); 4 Jun 2007 14:45:33 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 92077 invoked by uid 500); 4 Jun 2007 14:45:33 -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 92066 invoked by uid 99); 4 Jun 2007 14:45:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2007 07:45:33 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2007 07:45:28 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6CD451A981A; Mon, 4 Jun 2007 07:45:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r544155 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Date: Mon, 04 Jun 2007 14:45:08 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070604144508.6CD451A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Mon Jun 4 07:45:07 2007 New Revision: 544155 URL: http://svn.apache.org/viewvc?view=rev&rev=544155 Log: Reduced derby.locks.waitTimeout for UpdatableResultSetTest because one of the test cases gets a lock timeout in an internal transaction (compilation of a trigger statement). The hang is probably caused by DERBY-177. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?view=diff&rev=544155&r1=544154&r2=544155 ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Mon Jun 4 07:45:07 2007 @@ -29,6 +29,7 @@ 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; @@ -290,8 +291,14 @@ suite.addTest(new CleanDatabaseTestSetup(embeddedSuite)); suite.addTest(TestConfiguration.clientServerDecorator( new CleanDatabaseTestSetup(clientSuite))); - - return suite; + + // DERBY-177: The internal transaction that tries to compile the + // trigger in testDeleteRowWithDeleteTrigger gets a lock timeout + // because the main transaction has an exclusive lock on the trigger + // statement. It does not fail, because the compilation is retried in + // the main transaction where it completes successfully. Reduce the + // lock timeout to make the test run faster until the bug is fixed. + return DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4); } private static TestSuite baseSuite(String name) {