Repository: bigtop Updated Branches: refs/heads/master d6c5f77b4 -> 0bbfd8bd5
BIGTOP-1524. FailureExecutor breaks smoke tests : Smoke tests should run from source. Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0bbfd8bd Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0bbfd8bd Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0bbfd8bd Branch: refs/heads/master Commit: 0bbfd8bd561f2ab39b300c0a549f3cc954fab0f6 Parents: d6c5f77 Author: jayunit100 <[email protected]> Authored: Thu Nov 13 00:15:31 2014 -0500 Committer: jayunit100 <[email protected]> Committed: Fri Nov 14 08:37:21 2014 -0500 ---------------------------------------------------------------------- bigtop-deploy/vm/smoke-tests.sh | 2 +- .../bigtop/itest/failures/FailureVars.groovy | 4 ++-- bigtop-tests/smoke-tests/mapreduce/build.gradle | 19 ++++++++++++++++--- .../hadoop/mapreduce/TestHadoopExamples.groovy | 1 + 4 files changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0bbfd8bd/bigtop-deploy/vm/smoke-tests.sh ---------------------------------------------------------------------- diff --git a/bigtop-deploy/vm/smoke-tests.sh b/bigtop-deploy/vm/smoke-tests.sh index cfb4050..abc0c09 100755 --- a/bigtop-deploy/vm/smoke-tests.sh +++ b/bigtop-deploy/vm/smoke-tests.sh @@ -17,4 +17,4 @@ su -s /bin/bash $HCFS_USER -c 'hadoop fs -chmod 777 /user/vagrant' su -s /bin/bash $HCFS_USER -c 'hadoop fs -chmod 777 /user/root' yum install -y pig hive flume mahout -cd /bigtop-home/bigtop-tests/smoke-tests && ./gradlew compileGroovy test -Dsmoke.tests=pig --info +cd /bigtop-home/bigtop-tests/smoke-tests && ./gradlew clean compileGroovy test -Dsmoke.tests=mapreduce,pig --info http://git-wip-us.apache.org/repos/asf/bigtop/blob/0bbfd8bd/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy ---------------------------------------------------------------------- diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy index 6bc1ca3..3d11507 100644 --- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy +++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy @@ -14,8 +14,8 @@ public class FailureVars { private final String CRON_SERVICE; private final int SLEEP_TIME = 100; private static FailureVars instance = null; - private String propertyFile = "/vars.properties" - private Boolean useProperties = System.getProperty("useProperties", Boolean.FALSE.toString()); + private String propertyFile = "/failureVars.properties" + private Boolean useProperties = Boolean.parseBoolean(System.getProperty("useFailureProperties", "false")); private String testHost; private String testRemoteHost; private String runFailures; http://git-wip-us.apache.org/repos/asf/bigtop/blob/0bbfd8bd/bigtop-tests/smoke-tests/mapreduce/build.gradle ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/mapreduce/build.gradle b/bigtop-tests/smoke-tests/mapreduce/build.gradle index 7b67b4f..83a16a6 100644 --- a/bigtop-tests/smoke-tests/mapreduce/build.gradle +++ b/bigtop-tests/smoke-tests/mapreduce/build.gradle @@ -25,9 +25,10 @@ repositories { dependencies { //needed to avoid groovy not on classpath error. testCompile module('org.codehaus.groovy:groovy:1.8.0') - testCompile group: 'org.apache.bigtop.itest', name: 'itest-common', version: itestVersion, transitive: 'true' + compile group: 'junit', name: 'junit', version: '4.11', transitive: 'true' testCompile group: 'org.apache.hadoop', name: 'hadoop-common', version: hadoopVersion, transitive: 'true' - testCompile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion, transitive: 'true' + compile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion, transitive: 'true' + compile "org.codehaus.groovy:groovy:1.8.0" } @@ -38,15 +39,27 @@ def tests_to_include() { } sourceSets { + main { + groovy { + srcDirs = [ + "$System.env.BIGTOP_HOME"+"/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/", + "$System.env.BIGTOP_HOME"+"/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/" + ] + } + } test { resources { srcDirs = [ 'conf/', ] } + groovy { srcDirs = [ - "$System.env.BIGTOP_HOME"+"/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce"] + "$System.env.BIGTOP_HOME"+"/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce", + "$System.env.BIGTOP_HOME"+"/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/", + "$System.env.BIGTOP_HOME"+"/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/" + ] exclude { FileTreeElement elem -> (doExclude(elem.getName())) } http://git-wip-us.apache.org/repos/asf/bigtop/blob/0bbfd8bd/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy index b4dff17..2d152cb 100644 --- a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy +++ b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/mapreduce/TestHadoopExamples.groovy @@ -19,6 +19,7 @@ package org.apache.bigtop.itest.hadoop.mapreduce import org.apache.bigtop.itest.failures.FailureExecutor +import org.apache.bigtop.itest.failures.FailureVars import org.junit.BeforeClass import org.junit.AfterClass import static org.junit.Assert.assertNotNull
