You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/06/20 01:39:43 UTC
[1/2] git commit: SLIDER-24 ensuring accumulo and hbase funtests have
stub tests that are never skipped;
have a separate fail-if-no-tests switch for the functional tests that defaults
to failse
Repository: incubator-slider
Updated Branches:
refs/heads/develop 87396348a -> ad07ead50
SLIDER-24 ensuring accumulo and hbase funtests have stub tests that are never skipped; have a separate fail-if-no-tests switch for the functional tests that defaults to failse
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/48723c0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/48723c0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/48723c0f
Branch: refs/heads/develop
Commit: 48723c0f32cf46958ce21aed859f85fa377f9d55
Parents: a95c9b0
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jun 19 16:38:59 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Jun 19 16:38:59 2014 -0700
----------------------------------------------------------------------
pom.xml | 1 +
slider-funtest/pom.xml | 4 +--
.../accumulo/accumulo-funtests/pom.xml | 2 +-
.../slider/providers/accumulo/TestStub.groovy | 32 ++++++++++++++++++++
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
.../slider/providers/hbase/TestStub.groovy | 32 ++++++++++++++++++++
6 files changed, 69 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48723c0f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30721dc..0e056d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,6 +243,7 @@
<test.argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</test.argLine>
<test.reuseForks>false</test.reuseForks>
<test.failIfNoTests>true</test.failIfNoTests>
+ <test.funtests.failIfNoTests>false</test.funtests.failIfNoTests>
<test.forkMode>always</test.forkMode>
<!--
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48723c0f/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index e56b19d..42a57b2 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -101,8 +101,8 @@
</forkedProcessTimeoutInSeconds>
<threadCount>1</threadCount>
<argLine>${test.argLine}</argLine>
- <failIfNoTests>${test.failIfNoTests}</failIfNoTests>
-
+ <failIfNoTests>${test.funtests.failIfNoTests}</failIfNoTests>
+
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>${build.redirect.test.output.to.file}</redirectTestOutputToFile>
<systemPropertyVariables>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48723c0f/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 4376a64..27d9e89 100644
--- a/slider-providers/accumulo/accumulo-funtests/pom.xml
+++ b/slider-providers/accumulo/accumulo-funtests/pom.xml
@@ -96,7 +96,7 @@
</forkedProcessTimeoutInSeconds>
<threadCount>1</threadCount>
<argLine>${test.argLine}</argLine>
- <failIfNoTests>${test.failIfNoTests}</failIfNoTests>
+ <failIfNoTests>${test.funtests.failIfNoTests}</failIfNoTests>
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>${build.redirect.test.output.to.file}</redirectTestOutputToFile>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48723c0f/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
new file mode 100644
index 0000000..3d9abb7
--- /dev/null
+++ b/slider-providers/accumulo/accumulo-funtests/src/test/groovy/org/apache/slider/providers/accumulo/TestStub.groovy
@@ -0,0 +1,32 @@
+/*
+ * 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/48723c0f/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 64a2991..62db32e 100644
--- a/slider-providers/hbase/hbase-funtests/pom.xml
+++ b/slider-providers/hbase/hbase-funtests/pom.xml
@@ -97,7 +97,7 @@
</forkedProcessTimeoutInSeconds>
<threadCount>1</threadCount>
<argLine>${test.argLine}</argLine>
- <failIfNoTests>${test.failIfNoTests}</failIfNoTests>
+ <failIfNoTests>${test.funtests.failIfNoTests}</failIfNoTests>
<trimStackTrace>false</trimStackTrace>
<redirectTestOutputToFile>${build.redirect.test.output.to.file}</redirectTestOutputToFile>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/48723c0f/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
new file mode 100644
index 0000000..f683ded
--- /dev/null
+++ b/slider-providers/hbase/hbase-funtests/src/test/groovy/org/apache/slider/providers/hbase/TestStub.groovy
@@ -0,0 +1,32 @@
+/*
+ * 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 {
+
+ }
+}
[2/2] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Posted by st...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ad07ead5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ad07ead5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ad07ead5
Branch: refs/heads/develop
Commit: ad07ead50188f7a37e0e7f56b110adac29d9a4c4
Parents: 48723c0 8739634
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jun 19 16:39:35 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Jun 19 16:39:35 2014 -0700
----------------------------------------------------------------------
app-packages/hbase/README.txt | 45 +++
app-packages/hbase/appConfig.json | 64 ++++
app-packages/hbase/configuration/global.xml | 160 ++++++++
.../hbase/configuration/hbase-log4j.xml | 142 ++++++++
.../hbase/configuration/hbase-policy.xml | 53 +++
app-packages/hbase/configuration/hbase-site.xml | 365 +++++++++++++++++++
app-packages/hbase/jmx_metrics.json | 56 +++
app-packages/hbase/metainfo.xml | 109 ++++++
app-packages/hbase/package/scripts/__init__.py | 19 +
app-packages/hbase/package/scripts/functions.py | 40 ++
app-packages/hbase/package/scripts/hbase.py | 125 +++++++
.../hbase/package/scripts/hbase_client.py | 43 +++
.../hbase/package/scripts/hbase_master.py | 63 ++++
.../hbase/package/scripts/hbase_regionserver.py | 66 ++++
.../hbase/package/scripts/hbase_service.py | 45 +++
app-packages/hbase/package/scripts/params.py | 109 ++++++
.../hbase/package/scripts/status_params.py | 26 ++
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 62 ++++
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 62 ++++
.../hbase/package/templates/hbase-env.sh.j2 | 81 ++++
.../package/templates/hbase_client_jaas.conf.j2 | 22 ++
.../package/templates/hbase_master_jaas.conf.j2 | 25 ++
.../templates/hbase_regionserver_jaas.conf.j2 | 25 ++
.../hbase/package/templates/regionservers.j2 | 20 +
app-packages/hbase/pom.xml | 93 +++++
app-packages/hbase/resources.json | 19 +
app-packages/hbase/src/assembly/hbase.xml | 71 ++++
pom.xml | 1 +
28 files changed, 2011 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ad07ead5/pom.xml
----------------------------------------------------------------------