You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2014/10/07 22:12:48 UTC
svn commit: r1629974 - in /hive/trunk/hcatalog/src/test/e2e/templeton:
build.xml drivers/TestDriverCurl.pm
Author: thejas
Date: Tue Oct 7 20:12:47 2014
New Revision: 1629974
URL: http://svn.apache.org/r1629974
Log:
HIVE-8360 : Add cross cluster support for webhcat E2E tests (Aswathy Chellammal Sreekumar via Thejas Nair)
Modified:
hive/trunk/hcatalog/src/test/e2e/templeton/build.xml
hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
Modified: hive/trunk/hcatalog/src/test/e2e/templeton/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/build.xml?rev=1629974&r1=1629973&r2=1629974&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/build.xml (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/build.xml Tue Oct 7 20:12:47 2014
@@ -111,6 +111,7 @@
<env key="USER_NAME" value="${test.user.name}"/>
<env key="HARNESS_CONF" value="${basedir}/conf/default.conf"/>
<env key="SECURE_MODE" value="${secure.mode}"/>
+ <env key="USER_REALM" value="${user.realm}"/>
<env key="HADOOP_VERSION" value="${hadoopversion}"/>
<arg value="./test_harness.pl"/>
<arg line="${tests.to.run}"/>
@@ -148,6 +149,7 @@
<env key="OTHER_USER_NAME" value="${test.other.user.name}"/>
<env key="HARNESS_CONF" value="${basedir}/conf/default.conf"/>
<env key="SECURE_MODE" value="${secure.mode}"/>
+ <env key="USER_REALM" value="${user.realm}"/>
<env key="KEYTAB_DIR" value="${keytab.dir}"/>
<arg value="./test_harness.pl"/>
<arg line="${tests.to.run}"/>
@@ -186,7 +188,9 @@
<env key="USER_NAME" value="${test.user.name}"/>
<env key="DOAS_USER" value="${doas.user}"/>
<env key="HARNESS_CONF" value="${basedir}/conf/default.conf"/>
+ <env key="USER_REALM" value="${user.realm}"/>
<env key="SECURE_MODE" value="${secure.mode}"/>
+ <env key="USER_REALM" value="${user.realm}"/>
<arg value="./test_harness.pl"/>
<arg line="${tests.to.run}"/>
<arg value="${basedir}/tests/doas.conf"/>
Modified: hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm?rev=1629974&r1=1629973&r2=1629974&view=diff
==============================================================================
--- hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm (original)
+++ hive/trunk/hcatalog/src/test/e2e/templeton/drivers/TestDriverCurl.pm Tue Oct 7 20:12:47 2014
@@ -193,6 +193,7 @@ sub globalSetup
$globalHash->{'db_password'} = $ENV{'DB_PASSWORD'};
$globalHash->{'is_secure_mode'} = $ENV{'SECURE_MODE'};
+ $globalHash->{'user_realm'} = $ENV{'USER_REALM'};
# add libexec location to the path
if (defined($ENV{'PATH'})) {
@@ -491,7 +492,14 @@ sub execCurlCmd(){
} elsif(scalar @files > 1){
die "More than one keytab file found for user $user_name in $keytab_dir";
}
- my @cmd = ('kinit', '-k', '-t', $files[0], $user_name);
+ my @cmd = ();
+ if (defined $testCmd->{'user_realm'}){
+ my $user_name_with_realm_name = $user_name.'@'.$testCmd->{'user_realm'};
+ @cmd = ('kinit', '-k', '-t', $files[0], $user_name_with_realm_name);
+ }
+ else{
+ @cmd = ('kinit', '-k', '-t', $files[0], $user_name);
+ }
print $log "Command @cmd";
IPC::Run::run(\@cmd, \undef, $log, $log) or
die "Could not kinit as $user_name using " . $files[0] . " $ERRNO";