Author: stack
Date: Thu Sep 29 05:42:13 2011
New Revision: 1177168
URL: http://svn.apache.org/viewvc?rev=1177168&view=rev
Log:
HBASE-4454 Add failsafe plugin to build and rename integration tests
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/pom.xml
hbase/trunk/src/docbkx/developer.xml
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1177168&r1=1177167&r2=1177168&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Sep 29 05:42:13 2011
@@ -317,8 +317,7 @@ Release 0.92.0 - Unreleased
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for
expected
blocks read and for catching regressions (Kannan)
- HBASE-4449 LoadIncrementalHFiles should be able to handle CFs with blooms
- (David Revell)
+
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
HBASE-3292 Expose block cache hit/miss/evict counts into region server
@@ -550,6 +549,10 @@ Release 0.92.0 - Unreleased
HBASE-4280 [replication] ReplicationSink can deadlock itself via handlers
HBASE-4014 Coprocessors: Flag the presence of coprocessors in logged
exceptions (Eugene Koontz)
+ HBASE-4449 LoadIncrementalHFiles should be able to handle CFs with blooms
+ (David Revell)
+ HBASE-4454 Add failsafe plugin to build and rename integration tests
+ (Jesse Yates)
TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified: hbase/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1177168&r1=1177167&r2=1177168&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Thu Sep 29 05:42:13 2011
@@ -258,6 +258,39 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <includes>
+ <include>${integrationtest.include}</include>
+ </includes>
+ <excludes>
+ <exlude>${unittest.include}</exlude>
+ <exclude>**/*$*</exclude>
+ <exclude>${test.exclude.pattern}</exclude>
+ </excludes>
+ <environmentVariables>
+
<LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/nativelib</LD_LIBRARY_PATH>
+
<DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/nativelib</DYLD_LIBRARY_PATH>
+ </environmentVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@@ -468,9 +501,10 @@
<configuration>
<forkMode>always</forkMode>
<includes>
- <include>**/Test*.java</include>
+ <include>${unittest.include}</include>
</includes>
<excludes>
+ <exclude>${integrationtest.include}</exclude>
<exclude>**/*$*</exclude>
<exclude>${test.exclude.pattern}</exclude>
</excludes>
@@ -480,6 +514,11 @@
</environmentVariables>
</configuration>
</plugin>
+ <!-- Run integration tests with mvn verify -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
@@ -691,6 +730,11 @@
<!-- For flaky tests exclusion -->
<test.exclude></test.exclude>
<test.exclude.pattern>**/${test.exclude}.java</test.exclude.pattern>
+
+ <!-- Test inclusion patterns -->
+ <unittest.include>**/Test*.java</unittest.include>
+ <integrationtest.include>**/IntegrationTest*.java</integrationtest.include>
+
</properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
@@ -1594,6 +1638,25 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.6</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.9</version>
+ <reportSets>
+ <reportSet>
+ <id>integration-tests</id>
+ <reports>
+ <report>report-only</report>
+ </reports>
+ <configuration>
+ <outputName>failsafe-report</outputName>
+ <reportsDirectories>
+
<reportsDirectory>${project.build.directory}/failsafe-reports</reportsDirectory>
+ </reportsDirectories>
+ </configuration>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
</project>
Modified: hbase/trunk/src/docbkx/developer.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/docbkx/developer.xml?rev=1177168&r1=1177167&r2=1177168&view=diff
==============================================================================
--- hbase/trunk/src/docbkx/developer.xml (original)
+++ hbase/trunk/src/docbkx/developer.xml Thu Sep 29 05:42:13 2011
@@ -203,6 +203,12 @@ mvn test -Dtest=org.apache.hadoop.hbase.
</programlisting>
</para>
</section>
+ <section xml:id="integration.tests">
+ <title>Integration Tests</title>
+ <para>HBase 0.92 added a <varname>verify</varname> maven target.
Invocation will
+ run a suite of long-running tests via the maven <link
xlink:href="http://maven.apache.org/plugins/maven-failsafe-plugin/">failsafe
plugin</link>.
+ </para>
+ </section>
<section xml:id="code.standards">
<title>Code Standards</title>
<para>See <xref linkend="eclipse.code.formatting"/> and <xref
linkend="common.patch.feedback"/>.