svn commit: r1621215 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java

[da...@apache.org]

Author: dag
Date: Thu Aug 28 22:08:36 2014
New Revision: 1621215

URL: http://svn.apache.org/r1621215
Log:
DERBY-6628 Intermittent error in TriggerGeneralTest

Patch derby-6628b filters away any locks on system tables stemming
from (re)compilations of statements, since compilation locks is not of
primary interest in this test.

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java?rev=1621215&r1=1621214&r2=1621215&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java Thu Aug 28 22:08:36 2014
@@ -858,8 +858,11 @@ public final class TriggerGeneralTest ex
         assertUpdateCount(st, 1,
             "delete from t1 where a = 3");
 
-        rs = st.executeQuery("select type, mode, tablename from "
-            + "syscs_diag.lock_table order by tablename, type");
+        rs = st.executeQuery("select type, mode, tablename from " +
+                "syscs_diag.lock_table " +
+                "where tablename not like 'SYS%'" + // DERBY-6628: filter
+                                                    // any such compilation lock
+                "order by tablename, type");
 
         expColNames = new String [] {"TYPE", "MODE", "TABLENAME"};
         JDBC.assertColumnNames(rs, expColNames);