diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml index 375c2a1..cea29b6 100644 --- a/testutils/ptest2/pom.xml +++ b/testutils/ptest2/pom.xml @@ -26,8 +26,9 @@ limitations under the License. hive-ptest UTF-8 - 2.4.1 + 2.6.2 3.2.16.RELEASE + 1.9.2 @@ -48,7 +49,7 @@ limitations under the License. commons-io commons-io - 2.1 + 2.4 commons-cli @@ -58,12 +59,12 @@ limitations under the License. commons-lang commons-lang - 2.5 + 2.6 com.google.guava guava - 15.0 + 18.0 org.apache.logging.log4j @@ -83,37 +84,43 @@ limitations under the License. org.apache.httpcomponents httpclient - 4.2.5 + 4.4 org.apache.jclouds jclouds-core - 1.7.3 + ${jclouds.version} org.apache.jclouds jclouds-compute - 1.7.3 + ${jclouds.version} org.apache.jclouds.provider aws-ec2 - 1.7.3 + ${jclouds.version} org.apache.jclouds.api ec2 - 1.7.3 + ${jclouds.version} org.apache.jclouds.driver jclouds-sshj - 1.7.3 + ${jclouds.version} org.apache.jclouds.driver jclouds-log4j - 1.7.3 + ${jclouds.version} + + + log4j + log4j + + org.apache.velocity @@ -128,13 +135,13 @@ limitations under the License. org.slf4j slf4j-api - 1.6.1 + 1.7.10 - + org.springframework spring-web @@ -179,8 +186,8 @@ limitations under the License. maven-compiler-plugin 3.1 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java index e38cbb4..5da804f 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.OutputStreamWriter; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -35,8 +34,6 @@ import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.PatternLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt index 83bcbee..092461b 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt @@ -85,10 +85,16 @@ fi echo $pid >> batch.pid wait $pid ret=$? -find ./ -type f -name hive.log -o -name spark.log | \ +find ./ -type f -name hive.log -o -name spark.log -o -name derby.log | \ xargs -I {} sh -c 'f=$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' find ./ -type f -name 'TEST-*.xml' | \ xargs -I {} sh -c 'f=TEST-batch-1-$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' +find ./ -path "*/spark/work" | \ + xargs -I {} sh -c 'mv {} /some/log/dir/spark-log' +find ./ -type f -name 'syslog*' | \ + xargs -I {} sh -c 'mkdir -p /some/log/dir/syslogs; mv {} /some/log/dir/syslogs' + + if [[ -f /some/log/dir/.log ]] then mv /some/log/dir/.log /some/log/dir/dot.log diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt index 5705839..3270167 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt @@ -85,10 +85,16 @@ fi echo $pid >> batch.pid wait $pid ret=$? -find ./ -type f -name hive.log -o -name spark.log | \ +find ./ -type f -name hive.log -o -name spark.log -o -name derby.log | \ xargs -I {} sh -c 'f=$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' find ./ -type f -name 'TEST-*.xml' | \ xargs -I {} sh -c 'f=TEST-batch-1-$(basename {}); test -f /some/log/dir/$f && f=$f-$(uuidgen); mv {} /some/log/dir/$f' +find ./ -path "*/spark/work" | \ + xargs -I {} sh -c 'mv {} /some/log/dir/spark-log' +find ./ -type f -name 'syslog*' | \ + xargs -I {} sh -c 'mkdir -p /some/log/dir/syslogs; mv {} /some/log/dir/syslogs' + + if [[ -f /some/log/dir/.log ]] then mv /some/log/dir/.log /some/log/dir/dot.log