From cd1ca562ca9238acb89ebb26ac18983a049e7498 Mon Sep 17 00:00:00 2001
From: "Robert (Bobby) Evans" <evans@yahoo-inc.com>
Date: Tue, 10 Oct 2017 17:06:30 -0500
Subject: [PATCH] STORM-2771: By default don't run any tests as integration
 tests

---
 pom.xml                                       |  2 ++
 .../jvm/org/apache/storm/testing/NoTests.java | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 storm-client/src/jvm/org/apache/storm/testing/NoTests.java

diff --git a/pom.xml b/pom.xml
index 85d575fd3ad..a4892a726e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,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.group>org.apache.storm.testing.NoTests</java.integration.test.group> <!-- Fake group so no integration tests run by default-->
         <!-- 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>
 
@@ -1109,6 +1110,7 @@
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>${surefire.version}</version>
                     <configuration>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <includes>
                             <include>${java.integration.test.include}</include>
                         </includes>
diff --git a/storm-client/src/jvm/org/apache/storm/testing/NoTests.java b/storm-client/src/jvm/org/apache/storm/testing/NoTests.java
new file mode 100644
index 00000000000..794bf66a53f
--- /dev/null
+++ b/storm-client/src/jvm/org/apache/storm/testing/NoTests.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package org.apache.storm.testing;
+
+/**
+ * This is the opposite of IntegrationTest.  It is an annotation that no tests should use, simply to trick the failsafe plugin
+ * into not running any integration tests by default.
+ */
+public interface NoTests {
+}