You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2014/03/11 14:07:21 UTC
svn commit: r1576327 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
dev-tools/idea/.idea/libraries/ lucene/ lucene/core/
lucene/core/src/test/org/apache/lucene/util/junitcompat/ lucene/licenses/
Author: dweiss
Date: Tue Mar 11 13:07:20 2014
New Revision: 1576327
URL: http://svn.apache.org/r1576327
Log:
LUCENE-5475: upgraded randomized testing to 2.1.1. This will print full annotations on assumption-ignored tests. It also includes more fancy test filtering.
Added:
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java
- copied unchanged from r1576292, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestGroupFiltering.java
lucene/dev/branches/branch_4x/lucene/licenses/junit4-ant-2.1.1.jar.sha1
- copied unchanged from r1576292, lucene/dev/trunk/lucene/licenses/junit4-ant-2.1.1.jar.sha1
lucene/dev/branches/branch_4x/lucene/licenses/randomizedtesting-runner-2.1.1.jar.sha1
- copied unchanged from r1576292, lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.1.1.jar.sha1
Removed:
lucene/dev/branches/branch_4x/lucene/licenses/junit4-ant-2.0.13.jar.sha1
lucene/dev/branches/branch_4x/lucene/licenses/randomizedtesting-runner-2.0.13.jar.sha1
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java
lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1576327&r1=1576326&r2=1576327&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/JUnit.xml Tue Mar 11 13:07:20 2014
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
- <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.13.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1576327&r1=1576326&r2=1576327&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Tue Mar 11 13:07:20 2014
@@ -993,6 +993,7 @@
<propertyref prefix="tests.timeoutSuite" />
<propertyref prefix="tests.jettyConnector" />
<propertyref prefix="tests.disableHdfs" />
+ <propertyref prefix="tests.filter" />
</syspropertyset>
<!-- Pass randomized settings to the forked JVM. -->
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java?rev=1576327&r1=1576326&r2=1576327&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/util/junitcompat/WithNestedTests.java Tue Mar 11 13:07:20 2014
@@ -28,6 +28,7 @@ import org.apache.lucene.util.TestRuleIg
import org.apache.lucene.util.TestRuleMarkFailure;
import org.junit.After;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -73,6 +74,13 @@ public abstract class WithNestedTests {
private TestRuleIgnoreAfterMaxFailures prevRule;
protected void before() throws Throwable {
+ String filter = System.getProperty("tests.filter");
+ if (filter != null && !filter.trim().isEmpty()) {
+ // We're running with a complex test filter. This will affect nested tests anyway
+ // so ignore them.
+ Assume.assumeTrue(false);
+ }
+
TestRuleIgnoreAfterMaxFailures newRule = new TestRuleIgnoreAfterMaxFailures(Integer.MAX_VALUE);
prevRule = LuceneTestCase.replaceMaxFailureRule(newRule);
}
Modified: lucene/dev/branches/branch_4x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-versions.properties?rev=1576327&r1=1576326&r2=1576327&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-versions.properties Tue Mar 11 13:07:20 2014
@@ -8,7 +8,7 @@
/cglib/cglib-nodep = 2.2
/com.adobe.xmp/xmpcore = 5.1.2
-com.carrotsearch.randomizedtesting.version = 2.0.13
+com.carrotsearch.randomizedtesting.version = 2.1.1
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
/com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}