You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/10 19:11:31 UTC
svn commit: r1531049 - in /hive/trunk/testutils/ptest2/src:
main/java/org/apache/hive/ptest/execution/
main/java/org/apache/hive/ptest/execution/conf/ main/resources/
test/java/org/apache/hive/ptest/execution/
Author: brock
Date: Thu Oct 10 17:11:30 2013
New Revision: 1531049
URL: http://svn.apache.org/r1531049
Log:
HIVE-5445 - PTest2 should use testonly target
Modified:
hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
hive/trunk/testutils/ptest2/src/main/resources/batch-exec.vm
hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java
hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
Modified: hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java?rev=1531049&r1=1531048&r2=1531049&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java (original)
+++ hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java Thu Oct 10 17:11:30 2013
@@ -112,7 +112,8 @@ public class PTest {
put("logDir", logDir.getAbsolutePath()).
put("javaHome", configuration.getJavaHome()).
put("javaHomeForTests", configuration.getJavaHomeForTests()).
- put("antEnvOpts", configuration.getAntEnvOpts());
+ put("antEnvOpts", configuration.getAntEnvOpts()).
+ put("antTestTarget", configuration.getAntTestTarget());
final ImmutableMap<String, String> templateDefaults = templateDefaultsBuilder.build();
TestParser testParser = new TestParser(configuration.getContext(),
new File(mExecutionContext.getLocalWorkingDirectory(), configuration.getRepositoryName() + "-source"),
@@ -231,6 +232,7 @@ public class PTest {
private static final String JAVA_HOME_TEST = TestConfiguration.JAVA_HOME_TEST;
private static final String ANT_TEST_ARGS = TestConfiguration.ANT_TEST_ARGS;
private static final String ANT_ENV_OPTS = TestConfiguration.ANT_ENV_OPTS;
+ private static final String ANT_TEST_TARGET = TestConfiguration.ANT_TEST_TARGET;
/**
* All args override properties file settings except
* for this one which is additive.
@@ -300,6 +302,10 @@ public class PTest {
if(!antEnvOpts.isEmpty()) {
conf.setAntEnvOpts(antEnvOpts);
}
+ String antTestTarget = Strings.nullToEmpty(commandLine.getOptionValue(ANT_TEST_TARGET)).trim();
+ if(!antTestTarget.isEmpty()) {
+ conf.setAntTestTarget(antTestTarget);
+ }
String[] supplementalAntArgs = commandLine.getOptionValues(ANT_ARG);
if(supplementalAntArgs != null && supplementalAntArgs.length > 0) {
String antArgs = Strings.nullToEmpty(conf.getAntArgs());
Modified: hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java?rev=1531049&r1=1531048&r2=1531049&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java (original)
+++ hive/trunk/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestConfiguration.java Thu Oct 10 17:11:30 2013
@@ -39,6 +39,7 @@ public class TestConfiguration {
public static final String JAVA_HOME_TEST = "javaHomeForTests";
public static final String ANT_ENV_OPTS = "antEnvOpts";
public static final String ANT_TEST_ARGS = "antTestArgs";
+ public static final String ANT_TEST_TARGET = "antTestTarget";
private static final String REPOSITORY_TYPE = "repositoryType";
private static final String GIT = "git";
@@ -53,6 +54,7 @@ public class TestConfiguration {
private String antArgs;
private String antTestArgs;
private String antEnvOpts;
+ private String antTestTarget;
private String repositoryType;
private String repository;
private String repositoryName;
@@ -84,6 +86,7 @@ public class TestConfiguration {
antArgs = Preconditions.checkNotNull(context.getString(ANT_ARGS), ANT_ARGS).trim();
antTestArgs = context.getString(ANT_TEST_ARGS, "").trim();
antEnvOpts = context.getString(ANT_ENV_OPTS, "").trim();
+ antTestTarget = context.getString(ANT_TEST_TARGET, "test").trim();
javaHome = context.getString(JAVA_HOME, "").trim();
javaHomeForTests = context.getString(JAVA_HOME_TEST, "").trim();
patch = Strings.nullToEmpty(null);
@@ -142,6 +145,9 @@ public class TestConfiguration {
public String getAntEnvOpts() {
return antEnvOpts;
}
+ public String getAntTestTarget() {
+ return antTestTarget;
+ }
public String getJavaHome() {
return javaHome;
}
@@ -178,16 +184,20 @@ public class TestConfiguration {
public void setAntEnvOpts(String antEnvOpts) {
this.antEnvOpts = Strings.nullToEmpty(antEnvOpts);
}
+ public void setAntTestTarget(String antTestTarget) {
+ this.antTestTarget = Strings.nullToEmpty(antTestTarget);
+ }
@Override
public String toString() {
- return "TestConfiguration [antArgs=" + antArgs + ", antEnvOpts="
- + antEnvOpts + ", repositoryType=" + repositoryType + ", repository="
- + repository + ", repositoryName=" + repositoryName + ", patch="
- + patch + ", javaHome=" + javaHome + ", javaHomeForTests="
+ return "TestConfiguration [antArgs=" + antArgs + ", antTestArgs="
+ + antTestArgs + ", antEnvOpts=" + antEnvOpts + ", antTestTarget="
+ + antTestTarget + ", repositoryType=" + repositoryType
+ + ", repository=" + repository + ", repositoryName=" + repositoryName
+ + ", patch=" + patch + ", javaHome=" + javaHome + ", javaHomeForTests="
+ javaHomeForTests + ", branch=" + branch + ", jenkinsURL="
+ jenkinsURL + ", jiraUrl=" + jiraUrl + ", jiraUser=" + jiraUser
- + ", jiraName=" + jiraName + ", clearLibraryCache=" + clearLibraryCache
- + "]";
+ + ", jiraPassword=" + jiraPassword + ", jiraName=" + jiraName
+ + ", clearLibraryCache=" + clearLibraryCache + "]";
}
public static TestConfiguration fromInputStream(InputStream inputStream, Logger logger)
throws IOException {
Modified: hive/trunk/testutils/ptest2/src/main/resources/batch-exec.vm
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/main/resources/batch-exec.vm?rev=1531049&r1=1531048&r2=1531049&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/main/resources/batch-exec.vm (original)
+++ hive/trunk/testutils/ptest2/src/main/resources/batch-exec.vm Thu Oct 10 17:11:30 2013
@@ -17,8 +17,8 @@
##### Remember, this is a velocity template
set -x
umask 0022
-find $localDir/$instanceName/${repositoryName}-source/build -name 'TEST-*.xml' -delete
-find $localDir/$instanceName/${repositoryName}-source/build -name 'hive.log' -delete
+echo $$
+ps fauxww
chmod -R u+w $logDir
rm -rf $logDir
# makes $logDir and $logDir/tmp
@@ -35,8 +35,21 @@ fi
export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=$logDir/tmp ${antEnvOpts}"
export HADOOP_ROOT_LOGGER=INFO,console
export HADOOP_OPTS="-Dhive.log.dir=$logDir -Dhive.query.id=hadoop -Djava.io.tmpdir=$logDir/tmp"
-cd $localDir/$instanceName/${repositoryName}-source && \
- timeout 2h ant test -Dtest.junit.output.format=xml $antArgs \
+cd $localDir/$instanceName/${repositoryName}-source || exit 1
+find ./build -name 'TEST-*.xml' -delete
+find ./build -name 'hive.log' -delete
+find ./ -name junit_metastore_db | xargs -r rm -rf
+if [[ -s batch.pid ]]
+then
+ pid="`<batch.pid`"
+ if kill -9 -$pid 2>/dev/null
+ then
+ echo "Killed process group $pid"
+ sleep 1
+ fi
+fi
+echo "$$" > batch.pid
+timeout 2h ant ${antTestTarget} -Dtest.junit.output.format=xml \
-Divy.default.ivy.user.dir=$localDir/$instanceName/ivy \
-Divy.default.always.check.exact.revision=false \
-Divy.cache.ttl.default=eternal -Divy.checkmodified=false \
Modified: hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java?rev=1531049&r1=1531048&r2=1531049&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java (original)
+++ hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.java Thu Oct 10 17:11:30 2013
@@ -74,6 +74,7 @@ public class TestScripts {
templateVariables.put("javaHome", "/usr/java/jdk1.7");
templateVariables.put("antEnvOpts", "-Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128");
templateVariables.put("antTestArgs", "-DgrammarBuild.notRequired=true -Dskip.javadoc=true");
+ templateVariables.put("antTestTarget", "testonly");
String template = readResource("batch-exec.vm");
String actual = getTemplateResult(template, templateVariables);
Approvals.verify(actual);
Modified: hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt?rev=1531049&r1=1531048&r2=1531049&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt (original)
+++ hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt Thu Oct 10 17:11:30 2013
@@ -16,8 +16,8 @@
set -x
umask 0022
-find /some/local/dir/instance-1/apache-source/build -name 'TEST-*.xml' -delete
-find /some/local/dir/instance-1/apache-source/build -name 'hive.log' -delete
+echo $$
+ps fauxww
chmod -R u+w /some/log/dir
rm -rf /some/log/dir
# makes /some/log/dir and /some/log/dir/tmp
@@ -34,8 +34,21 @@ fi
export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=/some/log/dir/tmp -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128"
export HADOOP_ROOT_LOGGER=INFO,console
export HADOOP_OPTS="-Dhive.log.dir=/some/log/dir -Dhive.query.id=hadoop -Djava.io.tmpdir=/some/log/dir/tmp"
-cd /some/local/dir/instance-1/apache-source && \
- timeout 2h ant test -Dtest.junit.output.format=xml -Dant=arg1 \
+cd /some/local/dir/instance-1/apache-source || exit 1
+find ./build -name 'TEST-*.xml' -delete
+find ./build -name 'hive.log' -delete
+find ./ -name junit_metastore_db | xargs -r rm -rf
+if [[ -s batch.pid ]]
+then
+ pid="`<batch.pid`"
+ if kill -9 -$pid 2>/dev/null
+ then
+ echo "Killed process group $pid"
+ sleep 1
+ fi
+fi
+echo "$$" > batch.pid
+timeout 2h ant ${antTestTarget} -Dtest.junit.output.format=xml \
-Divy.default.ivy.user.dir=/some/local/dir/instance-1/ivy \
-Divy.default.always.check.exact.revision=false \
-Divy.cache.ttl.default=eternal -Divy.checkmodified=false \
Modified: hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt?rev=1531049&r1=1531048&r2=1531049&view=diff
==============================================================================
--- hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt (original)
+++ hive/trunk/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt Thu Oct 10 17:11:30 2013
@@ -16,8 +16,8 @@
set -x
umask 0022
-find /some/local/dir/instance-1/apache-source/build -name 'TEST-*.xml' -delete
-find /some/local/dir/instance-1/apache-source/build -name 'hive.log' -delete
+echo $$
+ps fauxww
chmod -R u+w /some/log/dir
rm -rf /some/log/dir
# makes /some/log/dir and /some/log/dir/tmp
@@ -34,8 +34,21 @@ fi
export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=/some/log/dir/tmp -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128"
export HADOOP_ROOT_LOGGER=INFO,console
export HADOOP_OPTS="-Dhive.log.dir=/some/log/dir -Dhive.query.id=hadoop -Djava.io.tmpdir=/some/log/dir/tmp"
-cd /some/local/dir/instance-1/apache-source && \
- timeout 2h ant test -Dtest.junit.output.format=xml -Dant=arg1 \
+cd /some/local/dir/instance-1/apache-source || exit 1
+find ./build -name 'TEST-*.xml' -delete
+find ./build -name 'hive.log' -delete
+find ./ -name junit_metastore_db | xargs -r rm -rf
+if [[ -s batch.pid ]]
+then
+ pid="`<batch.pid`"
+ if kill -9 -$pid 2>/dev/null
+ then
+ echo "Killed process group $pid"
+ sleep 1
+ fi
+fi
+echo "$$" > batch.pid
+timeout 2h ant testonly -Dtest.junit.output.format=xml \
-Divy.default.ivy.user.dir=/some/local/dir/instance-1/ivy \
-Divy.default.always.check.exact.revision=false \
-Divy.cache.ttl.default=eternal -Divy.checkmodified=false \