You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by rh...@apache.org on 2009/07/21 22:04:42 UTC

svn commit: r796517 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java

Author: rhillegas
Date: Tue Jul 21 20:04:42 2009
New Revision: 796517

URL: http://svn.apache.org/viewvc?rev=796517&view=rev
Log:
DERBY-4157: Skip diffs for DERBY-4214 discrepancies in trajectories which end at the 10.5 branch rather than just in trajectories which end at 10.5.1.1.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java?rev=796517&r1=796516&r2=796517&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java Tue Jul 21 20:04:42 2009
@@ -1324,7 +1324,7 @@
     private String filterKnownProblems( String tableName, String actual )
     {
         if (
-            _trajectory.endsAt( VERSION_10_5_1_1 ) &&
+            _trajectory.endsAt( BRANCH_10_5 ) &&
             ( contains( actual, DERBY_4214_1 ) || contains( actual, DERBY_4214_2 ) )
            )
         { return ""; }