Repository: bigtop Updated Branches: refs/heads/master 6ede02d43 -> d210cbb24
BIGTOP-2873. A few cosmetic changes to run_itest.sh output Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d210cbb2 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d210cbb2 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d210cbb2 Branch: refs/heads/master Commit: d210cbb246d9785b465d310f4f953b97e6df4a9e Parents: 6ede02d Author: Roman Shaposhnik <[email protected]> Authored: Wed Aug 23 16:27:39 2017 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Aug 26 19:22:31 2017 -0700 ---------------------------------------------------------------------- bigtop-tests/smoke-tests/run_itest.sh | 15 +++++++++++---- .../bigtop/itest/hadoop/hcfs/TestFuseHCFS.groovy | 8 +++++--- 2 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d210cbb2/bigtop-tests/smoke-tests/run_itest.sh ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/run_itest.sh b/bigtop-tests/smoke-tests/run_itest.sh index fc4ce57..0ad23cb 100755 --- a/bigtop-tests/smoke-tests/run_itest.sh +++ b/bigtop-tests/smoke-tests/run_itest.sh @@ -182,6 +182,9 @@ set_hive_vars() { TEST_SETTINGS="$TEST_SETTINGS -Dbigtop.test.hive.jdbc.url=$HIVE_JDBC_URL -Dbigtop.test.hive.metastore.url=$HIVE_METASTORE_URL -Dbigtop.test.hive.location=$HIVE_HDFS_LOCATION -Dbigtop.test.hive.jdbc.user=$HIVE_USER -Dbigtop.test.hive.jdbc.password=$HIVE_PASSWORD -Dbigtop.test.hive.conf.dir=$HIVE_CONF_DIR -Dbigtop.test.hadoop.conf.dir=$HADOOP_CONF_DIR -Dbigtop.test.hive.thrift.test=$TEST_THRIFT -Dbigtop.test.hive.hcatalog.test=$TEST_HCATALOG" } +set_odpi_runtime_vars() { + TEST_SETTINGS="$TEST_SETTINGS -DHCFS_IMPLEMENTATION=HCFS" +} print_cluster_info() { @@ -266,12 +269,16 @@ for s in `echo $ITESTS | sed -e 's#,# #g'`; do ALL_SMOKE_TASKS="$ALL_SMOKE_TASKS bigtop-tests:smoke-tests:$s:test" done -if echo "$ITESTS" | egrep -q 'hive|odpi-runtime' ; then - set_hive_vars -fi +case "$ITESTS" in + *odpi-runtime*) set_hive_vars + set_odpi_runtime_vars + ;; + *hive*) set_hive_vars + ;; +esac # CALL THE GRADLE WRAPPER TO RUN THE FRAMEWORK -$DIR/gradlew -q --continue clean -Psmoke.tests $TEST_SETTINGS $ALL_SMOKE_TASKS $LOGGING +$DIR/gradlew -q --continue clean -Psmoke.tests $TEST_SETTINGS $ALL_SMOKE_TASKS $LOGGING 1>&2 # SHOW RESULTS (HTML) print_tests http://git-wip-us.apache.org/repos/asf/bigtop/blob/d210cbb2/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestFuseHCFS.groovy ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestFuseHCFS.groovy b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestFuseHCFS.groovy index 4b73e40..22872a9 100644 --- a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestFuseHCFS.groovy +++ b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestFuseHCFS.groovy @@ -138,9 +138,11 @@ public class TestFuseDFS { @AfterClass public static void tearDown() { - shRoot.exec("umount ${mount_point}"); - logError(shRoot); - assertEquals("Failed: FUSE-DFS mount not cleaned up", 0, shRoot.getRet()); + if (isHDFS) { + shRoot.exec("umount ${mount_point}"); + logError(shRoot); + assertEquals("Failed: FUSE-DFS mount not cleaned up", 0, shRoot.getRet()); + } } @Test
