You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2014/07/17 02:23:47 UTC
[4/7] git commit: SLIDER-241 remove slider.funtest.enabled property
and use maven-failsafe-plugin to run ITs
SLIDER-241 remove slider.funtest.enabled property and use maven-failsafe-plugin to run ITs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/dfd3cd72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/dfd3cd72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/dfd3cd72
Branch: refs/heads/develop
Commit: dfd3cd724f9a972d15f2b43eaf8ab7c656bec87f
Parents: e1258c8
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Wed Jul 16 13:49:25 2014 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Wed Jul 16 13:49:25 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 10 +-----
pom.xml | 1 +
slider-funtest/pom.xml | 19 +++++++-----
.../abstracttests/AbstractTestBuildSetup.groovy | 3 --
.../framework/AgentCommandTestBase.groovy | 1 -
.../funtest/framework/CommandTestBase.groovy | 19 ++----------
.../funtest/framework/FuntestProperties.groovy | 3 --
.../accumulo/StubToForceGroovySrcToCompile.java | 22 --------------
.../accumulo/accumulo-funtests/pom.xml | 19 +++++++-----
.../slider/providers/accumulo/TestStub.groovy | 32 --------------------
.../accumulo/funtest/AccumuloCIIT.groovy | 5 ---
.../funtest/AccumuloCommandTestBase.groovy | 1 -
.../funtest/FunctionalAccumuloClusterIT.groovy | 2 --
.../FunctionalAccumuloM1T1GC1Mon1IT.groovy | 2 --
.../StubToForceGroovyTestsToCompile.java | 22 ++++++++++++++
slider-providers/hbase/hbase-funtests/pom.xml | 21 +++++++------
.../slider/providers/hbase/TestStub.groovy | 32 --------------------
.../hbase/funtest/DemoHBaseCluster.groovy | 2 +-
.../hbase/funtest/HBaseCommandTestBase.groovy | 2 --
.../providers/hbase/funtest/ImagesIT.groovy | 1 -
.../clusters/offline/slider/slider-client.xml | 11 -------
21 files changed, 61 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 985773a..f4db31b 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -81,6 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<id>run-integration-tests</id>
@@ -143,15 +144,6 @@
</dependency>
</dependencies>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- can't figure out how to get the surefire plugin not to pick up the ITs, so skip it entirely -->
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ae2a5e..e6d1e31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
test options
-->
+ <slider.conf.dir>${project.basedir}/src/test/clusters/offline/slider</slider.conf.dir>
<test.forkedProcessTimeoutInSeconds>18000</test.forkedProcessTimeoutInSeconds>
<test.argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</test.argLine>
<test.reuseForks>false</test.reuseForks>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 5117875..b6a7dfb 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -93,8 +93,17 @@
<!-- test -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>run-integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<!--mvn process fork options-->
<reuseForks>${test.reuseForks}</reuseForks>
@@ -121,12 +130,6 @@
<test.app.resource>../slider-core/src/test/app_packages/test_command_log/resources.json</test.app.resource>
<test.app.template>../slider-core/src/test/app_packages/test_command_log/appConfig.json</test.app.template>
</systemPropertyVariables>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/Test*$*.java</exclude>
- </excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
index c42589a..e0b87f7 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/abstracttests/AbstractTestBuildSetup.groovy
@@ -143,7 +143,6 @@ abstract class AbstractTestBuildSetup extends SliderTestUtils implements Funtest
@Test
public void testConfHasDefaultFS() throws Throwable {
Configuration conf = loadSliderConf()
- assumeBoolOption(conf, KEY_SLIDER_FUNTESTS_ENABLED, true)
String fs = conf.get("fs.defaultFS")
log.info("Test Filesystem $fs")
assert fs != null
@@ -152,9 +151,7 @@ abstract class AbstractTestBuildSetup extends SliderTestUtils implements Funtest
@Test
public void testConfHasRM() throws Throwable {
-
Configuration conf = loadSliderConf()
- assumeBoolOption(conf, KEY_SLIDER_FUNTESTS_ENABLED, true)
String val = conf.get(YarnConfiguration.RM_ADDRESS)
log.info("$YarnConfiguration.RM_ADDRESS = $val")
assert val != YarnConfiguration.DEFAULT_RM_ADDRESS
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy
index 26ae2bb..35e1834 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/AgentCommandTestBase.groovy
@@ -65,7 +65,6 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions {
public TemporaryFolder folder = new TemporaryFolder();
public static void assumeAgentTestsEnabled() {
- assumeFunctionalTestsEnabled()
assume(AGENTTESTS_ENABLED, "Agent tests disabled")
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index 08d352a..d3df015 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -66,8 +66,6 @@ abstract class CommandTestBase extends SliderTestUtils {
public static final int SLIDER_TEST_TIMEOUT
- public static final boolean FUNTESTS_ENABLED
-
public static final String YARN_RAM_REQUEST
@@ -83,8 +81,6 @@ abstract class CommandTestBase extends SliderTestUtils {
SLIDER_TEST_TIMEOUT = getTimeOptionMillis(SLIDER_CONFIG,
KEY_TEST_TIMEOUT,
1000 * DEFAULT_TEST_TIMEOUT_SECONDS)
- FUNTESTS_ENABLED =
- SLIDER_CONFIG.getBoolean(KEY_SLIDER_FUNTESTS_ENABLED, true)
YARN_RAM_REQUEST = SLIDER_CONFIG.get(
KEY_TEST_YARN_RAM_REQUEST,
@@ -327,9 +323,7 @@ abstract class CommandTestBase extends SliderTestUtils {
* @param cluster
*/
static void setupCluster(String cluster) {
- if (FUNTESTS_ENABLED) {
- ensureClusterDestroyed(cluster)
- }
+ ensureClusterDestroyed(cluster)
}
/**
@@ -338,9 +332,7 @@ abstract class CommandTestBase extends SliderTestUtils {
* @param name cluster name
*/
static void teardown(String name) {
- if (FUNTESTS_ENABLED) {
- freezeForce(name)
- }
+ freezeForce(name)
}
/**
@@ -508,11 +500,4 @@ abstract class CommandTestBase extends SliderTestUtils {
return status
}
- /**
- * if tests are not enabled: skip them
- */
- public static void assumeFunctionalTestsEnabled() {
- assume(FUNTESTS_ENABLED, "Functional tests disabled")
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
index 9b63c22..1096dfa 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
@@ -40,7 +40,6 @@ public interface FuntestProperties extends SliderXMLConfKeysForTesting {
String KEY_SLIDER_TEST_NUM_WORKERS = "slider.test.cluster.size"
int DEFAULT_SLIDER_NUM_WORKERS = 1
- String KEY_SLIDER_TEST_ZK_HOSTS = "slider.test.zkhosts";
String DEFAULT_SLIDER_ZK_HOSTS = "localhost:2181";
/**
@@ -49,8 +48,6 @@ public interface FuntestProperties extends SliderXMLConfKeysForTesting {
String KEY_AM_RESTART_SLEEP_TIME = "slider.test.am.restart.time"
int DEFAULT_AM_RESTART_SLEEP_TIME = 30000
- String KEY_SLIDER_FUNTESTS_ENABLED = "slider.funtest.enabled"
-
String CLIENT_CONFIG_FILENAME = SliderKeys.CLIENT_RESOURCE
String ENV_CONF_DIR = "SLIDER_CONF_DIR"
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-funtest/src/main/java/org/apache/slider/funtest/accumulo/StubToForceGroovySrcToCompile.java
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/java/org/apache/slider/funtest/accumulo/StubToForceGroovySrcToCompile.java b/slider-funtest/src/main/java/org/apache/slider/funtest/accumulo/StubToForceGroovySrcToCompile.java
deleted file mode 100644
index eefccbb..0000000
--- a/slider-funtest/src/main/java/org/apache/slider/funtest/accumulo/StubToForceGroovySrcToCompile.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.slider.funtest.accumulo;
-
-class StubToForceGroovySrcToCompile {
-}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/pom.xml b/slider-providers/accumulo/accumulo-funtests/pom.xml
index c55c0d5..1cd2163 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -85,8 +85,17 @@
<!-- functional test -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>run-integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<!--mvn process fork options-->
<reuseForks>${test.reuseForks}</reuseForks>
@@ -109,12 +118,6 @@
<slider.conf.dir>${slider.conf.dir}</slider.conf.dir>
<slider.bin.dir>../../../slider-assembly/target/slider-${project.version}-all/slider-${project.version}</slider.bin.dir>
</systemPropertyVariables>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/Test*$*.java</exclude>
- </excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/TestStub.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/TestStub.groovy b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/TestStub.groovy
deleted file mode 100644
index 3d9abb7..0000000
--- a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/TestStub.groovy
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.slider.providers.accumulo
-
-import org.junit.Test
-
-/**
- * this is here to ensure there is always a test
- */
-class TestStub {
-
- @Test
- public void testStubTest() throws Throwable {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy
index 546c04b..7283730 100644
--- a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy
+++ b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCIIT.groovy
@@ -16,7 +16,6 @@
*/
package org.apache.slider.providers.accumulo.funtest
-import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.accumulo.core.client.Connector
@@ -34,10 +33,6 @@ import org.apache.slider.funtest.framework.CommandTestBase
import org.apache.slider.funtest.framework.FuntestProperties
import org.apache.slider.funtest.framework.PortAssignments
-/**
- *
- */
-@CompileStatic
@Slf4j
class AccumuloCIIT extends FunctionalAccumuloClusterIT {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCommandTestBase.groovy b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCommandTestBase.groovy
index 1b5d8bf..7942ce1 100644
--- a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCommandTestBase.groovy
+++ b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/AccumuloCommandTestBase.groovy
@@ -62,7 +62,6 @@ abstract class AccumuloCommandTestBase extends CommandTestBase {
public static void assumeAccumuloTestsEnabled() {
- assumeFunctionalTestsEnabled()
assume(ACCUMULO_TESTS_ENABLED, "Accumulo tests disabled")
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloClusterIT.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloClusterIT.groovy b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloClusterIT.groovy
index 79dd611..465792c 100644
--- a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloClusterIT.groovy
+++ b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloClusterIT.groovy
@@ -18,7 +18,6 @@ package org.apache.slider.providers.accumulo.funtest
import static org.apache.slider.providers.accumulo.AccumuloConfigFileOptions.*
import static org.apache.slider.providers.accumulo.AccumuloKeys.*
-import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.slider.common.SliderExitCodes
@@ -33,7 +32,6 @@ import org.junit.Test
/**
*
*/
-@CompileStatic
@Slf4j
class FunctionalAccumuloClusterIT extends AccumuloCommandTestBase
implements FuntestProperties, Arguments, SliderExitCodes {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloM1T1GC1Mon1IT.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloM1T1GC1Mon1IT.groovy b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloM1T1GC1Mon1IT.groovy
index 865eacc..33910d4 100644
--- a/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloM1T1GC1Mon1IT.groovy
+++ b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/funtest/FunctionalAccumuloM1T1GC1Mon1IT.groovy
@@ -18,13 +18,11 @@
package org.apache.slider.providers.accumulo.funtest
-import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import org.apache.slider.api.ClusterDescription
import org.apache.slider.common.params.Arguments
import org.apache.slider.common.params.SliderActions
-@CompileStatic
@Slf4j
public class FunctionalAccumuloM1T1GC1Mon1IT extends FunctionalAccumuloClusterIT {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/accumulo/accumulo-funtests/src/test/java/org/apache/slider/providers/accumulo/funtest/StubToForceGroovyTestsToCompile.java
----------------------------------------------------------------------
diff --git a/slider-providers/accumulo/accumulo-funtests/src/test/java/org/apache/slider/providers/accumulo/funtest/StubToForceGroovyTestsToCompile.java b/slider-providers/accumulo/accumulo-funtests/src/test/java/org/apache/slider/providers/accumulo/funtest/StubToForceGroovyTestsToCompile.java
new file mode 100644
index 0000000..1a948a2
--- /dev/null
+++ b/slider-providers/accumulo/accumulo-funtests/src/test/java/org/apache/slider/providers/accumulo/funtest/StubToForceGroovyTestsToCompile.java
@@ -0,0 +1,22 @@
+/*
+ * 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.slider.providers.accumulo.funtest;
+
+class StubToForceGroovyTestsToCompile {
+}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/hbase/hbase-funtests/pom.xml
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/pom.xml b/slider-providers/hbase/hbase-funtests/pom.xml
index 7913fbf..08d27c3 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -85,8 +85,17 @@
<!-- functional test -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>run-integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<!--mvn process fork options-->
@@ -107,15 +116,9 @@
<java.security.krb5.realm>${slider.test.java.security.krb5.realm}</java.security.krb5.realm>
<java.security.krb5.kdc>${slider.test.java.security.krb5.kdc}</java.security.krb5.kdc>
<!-- this property must be supplied-->
- <slider.conf.dir>../../../src/test/clusters/offline/slider</slider.conf.dir>
+ <slider.conf.dir>${slider.conf.dir}</slider.conf.dir>
<slider.bin.dir>../../../slider-assembly/target/slider-${project.version}-all/slider-${project.version}</slider.bin.dir>
</systemPropertyVariables>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/Test*$*.java</exclude>
- </excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/TestStub.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/TestStub.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/TestStub.groovy
deleted file mode 100644
index f683ded..0000000
--- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/TestStub.groovy
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.slider.providers.hbase
-
-import org.junit.Test
-
-/**
- * this is here to ensure there is always a test
- */
-class TestStub {
-
- @Test
- public void testStubTest() throws Throwable {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/DemoHBaseCluster.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/DemoHBaseCluster.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/DemoHBaseCluster.groovy
index 9385cc9..1bef7d3 100644
--- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/DemoHBaseCluster.groovy
+++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/DemoHBaseCluster.groovy
@@ -22,7 +22,7 @@ import org.apache.hadoop.conf.Configuration
import org.apache.slider.api.ClusterDescription
import org.apache.slider.client.SliderClient
-class DemoHBaseCluster extends TestFunctionalHBaseCluster {
+class DemoHBaseCluster extends FunctionalHBaseClusterIT {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseCommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseCommandTestBase.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseCommandTestBase.groovy
index 8bad590..caaab04 100644
--- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseCommandTestBase.groovy
+++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/HBaseCommandTestBase.groovy
@@ -52,7 +52,6 @@ abstract class HBaseCommandTestBase extends CommandTestBase {
@BeforeClass
public static void extendClasspath() {
- assumeFunctionalTestsEnabled()
addExtraJar(HBaseClientProvider)
}
@@ -65,7 +64,6 @@ abstract class HBaseCommandTestBase extends CommandTestBase {
public void assumeHBaseTestsEnabled() {
- assumeFunctionalTestsEnabled()
assume(HBASE_TESTS_ENABLED, "HBase tests disabled")
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/ImagesIT.groovy
----------------------------------------------------------------------
diff --git a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/ImagesIT.groovy b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/ImagesIT.groovy
index 6611664..d1b5c55 100644
--- a/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/ImagesIT.groovy
+++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/funtest/ImagesIT.groovy
@@ -31,7 +31,6 @@ class ImagesIT extends CommandTestBase implements FuntestProperties {
@Before
public void verifyPreconditions() {
- assumeBoolOption(SLIDER_CONFIG, KEY_SLIDER_FUNTESTS_ENABLED, true)
assumeBoolOption(SLIDER_CONFIG, KEY_TEST_HBASE_ENABLED, true)
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/dfd3cd72/src/test/clusters/offline/slider/slider-client.xml
----------------------------------------------------------------------
diff --git a/src/test/clusters/offline/slider/slider-client.xml b/src/test/clusters/offline/slider/slider-client.xml
index 8385086..25c01cf 100644
--- a/src/test/clusters/offline/slider/slider-client.xml
+++ b/src/test/clusters/offline/slider/slider-client.xml
@@ -38,11 +38,6 @@
</property>
<property>
- <name>slider.funtest.enabled</name>
- <value>false</value>
- </property>
-
- <property>
<name>yarn.application.classpath</name>
<value>
/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*
@@ -62,12 +57,6 @@
</property>
<property>
- <name>slider.test.zkhosts</name>
- <description>list of the zookeeper hosts</description>
- <value></value>
- </property>
-
- <property>
<name>slider.test.accumulo.enabled</name>
<description>Flag to enable/disable Accumulo tests</description>
<value>false</value>