You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/11/20 19:00:57 UTC
[11/50] [abbrv] storm git commit: Merge branch 'STORM-2771' of
https://github.com/revans2/incubator-storm into STORM-2771
Merge branch 'STORM-2771' of https://github.com/revans2/incubator-storm into STORM-2771
STORM-2771: By default don't run any tests as integration tests
This closes #2368
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/90e13852
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/90e13852
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/90e13852
Branch: refs/heads/metrics_v2
Commit: 90e1385264104028ef720df4ee89d4f194a5e233
Parents: 644f5cb
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Oct 13 10:45:20 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Oct 13 11:00:13 2017 -0500
----------------------------------------------------------------------
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/90e13852/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f53171b..21ec2bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,6 +281,7 @@
<!-- Java and clojure build lifecycle test properties are defined here to avoid having to create a default profile -->
<java.unit.test.exclude>org.apache.storm.testing.IntegrationTest</java.unit.test.exclude>
<java.unit.test.include>**/Test*.java, **/*Test.java, **/*TestCase.java</java.unit.test.include> <!--maven surefire plugin default test list-->
+ <java.integration.test.include>no.tests</java.integration.test.include>
<!-- by default the clojure test set are all clojure tests that are not integration tests. This property is overridden in the profiles -->
<clojure.test.set>!integration.*</clojure.test.set>
@@ -553,7 +554,6 @@
<id>all-tests</id>
<properties>
<java.integration.test.include>**/*.java</java.integration.test.include>
- <java.integration.test.group>org.apache.storm.testing.IntegrationTest</java.integration.test.group>
<clojure.test.set>*.*</clojure.test.set>
</properties>
</profile>
@@ -563,7 +563,6 @@
<!--Java-->
<java.unit.test.include>no.unit.tests</java.unit.test.include>
<java.integration.test.include>**/*.java</java.integration.test.include>
- <java.integration.test.group>org.apache.storm.testing.IntegrationTest</java.integration.test.group>
<!--Clojure-->
<clojure.test.set>integration.*</clojure.test.set>
<clojure.test.declared.namespace.only>true</clojure.test.declared.namespace.only>
@@ -1032,10 +1031,11 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-surefire.version}</version>
<configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
<includes>
<include>${java.integration.test.include}</include>
</includes>
- <groups>${java.integration.test.group}</groups> <!--set in integration-test the profile-->
+ <groups>org.apache.storm.testing.IntegrationTest</groups>
<argLine>-Xmx1536m</argLine>
</configuration>
<executions>