diff --git hcatalog/src/test/e2e/templeton/tests/ddl.conf hcatalog/src/test/e2e/templeton/tests/ddl.conf index 23d3074..c7950ff 100644 --- hcatalog/src/test/e2e/templeton/tests/ddl.conf +++ hcatalog/src/test/e2e/templeton/tests/ddl.conf @@ -42,7 +42,7 @@ $cfg = #drop table if exists 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templetontest_tab2'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -52,7 +52,7 @@ $cfg = #create table 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=create table templetontest_tab2(i int, j bigint) STORED AS rcfile;'], 'json_field_substr_match' => {'stderr' => 'OK', 'exitcode' => '^0$'} @@ -61,7 +61,7 @@ $cfg = #show tables 'num' => 3, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=show tables;'], 'json_field_substr_match' => {'stderr' => 'OK', 'stdout' => 'templetontest_tab2', 'exitcode' => '^0$'} @@ -70,7 +70,7 @@ $cfg = #create table again, should fail 'num' => 4, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=create table templetontest_tab2(i int, j bigint) STORED AS rcfile;'], 'json_field_substr_match' => { 'exitcode' => '^1$'} @@ -79,7 +79,7 @@ $cfg = #describe table 'num' => 5, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=describe templetontest_tab2;'], 'json_field_substr_match' => { 'stdout' => '.*i\s+int.*\n.*j.*bigint.*', 'exitcode' => '^0$', 'stderr' => 'OK'} @@ -88,7 +88,7 @@ $cfg = #alter table - file format 'num' => 6, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=alter table templetontest_tab2 SET FILEFORMAT rcfile;'], 'json_field_substr_match' => { 'exitcode' => '^0$', 'stderr' => 'OK'} @@ -97,7 +97,7 @@ $cfg = #alter table - add column 'num' => 7, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=alter table templetontest_tab2 add columns(newcolx int);'], 'json_field_substr_match' => { 'exitcode' => '^0$', 'stderr' => 'OK'} @@ -106,7 +106,7 @@ $cfg = #describe table 'num' => 8, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=describe templetontest_tab2;'], 'json_field_substr_match' => { 'stdout' => '.*newcolx\s+int.*', 'exitcode' => '^0$', 'stderr' => 'OK'} @@ -123,7 +123,7 @@ $cfg = #drop database if exists 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=drop database if exists templeton_testempty_db'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -197,7 +197,7 @@ $cfg = #create db if not exists 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=create database if not exists templeton_testdb1;'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -444,7 +444,7 @@ $cfg = #drop table if exists 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templeton_testtab_rename1'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -454,7 +454,7 @@ $cfg = #drop table if exists 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templeton_testtab_rename2'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -464,7 +464,7 @@ $cfg = #create table if not exists 'num' => 3, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=create table if not exists templeton_testtab_rename1 (i int, j bigint) STORED AS rcfile;'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -473,7 +473,7 @@ $cfg = #rename table 'num' => 4, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl/database/default/table/templeton_testtab_rename1', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl/database/default/table/templeton_testtab_rename1?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','rename=templeton_testtab_rename2'], 'json_field_substr_match' => {'table' => 'templeton_testtab_rename2'}, @@ -509,7 +509,7 @@ $cfg = #drop table if exists 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:','exec=drop table if exists templetontest_parts'], 'json_field_substr_match' => {'stderr' => 'OK'}, @@ -521,7 +521,7 @@ $cfg = #create table if not exists 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/ddl', + 'url' => ':TEMPLETON_URL:/templeton/v1/ddl?user.name=:UNAME:', 'status_code' => 200, 'post_options' => ['user.name=:UNAME:', 'exec=create table if not exists templetontest_parts (i int, j bigint, ip STRING COMMENT \'IP Address of the User\') COMMENT \'This is the page view table\' PARTITIONED BY(dt STRING, country STRING) ROW FORMAT DELIMITED FIELDS TERMINATED BY \'\001\' COLLECTION ITEMS TERMINATED BY \'\002\' MAP KEYS TERMINATED BY \'\003\' STORED AS rcfile --LOCATION \'table1_location\' '], diff --git hcatalog/src/test/e2e/templeton/tests/jobstatus.conf hcatalog/src/test/e2e/templeton/tests/jobstatus.conf index 514f129..4441e8d 100644 --- hcatalog/src/test/e2e/templeton/tests/jobstatus.conf +++ hcatalog/src/test/e2e/templeton/tests/jobstatus.conf @@ -43,7 +43,7 @@ $cfg = #a simple load store script as UNAME_OTHER 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'user_name' => ':UNAME_OTHER:', 'post_options' => ['user.name=:UNAME_OTHER:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -57,7 +57,7 @@ $cfg = #a simple load store script as UNAME 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'user_name' => ':UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -71,7 +71,7 @@ $cfg = #a simple load store script as UNAME_OTHER 'num' => 3, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'user_name' => ':UNAME_OTHER:', 'post_options' => ['user.name=:UNAME_OTHER:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ], 'json_field_substr_match' => { 'id' => '\d+'}, diff --git hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf index e836111..9279d7f 100644 --- hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf +++ hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf @@ -41,7 +41,7 @@ $cfg = { 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt', 'input=:INPDIR_HDFS:/nums.txt', 'output=:OUTDIR:/mycounts', @@ -89,7 +89,7 @@ $cfg = 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt', 'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', 'define=MYPROP1=VALUE1', 'define=MYPROP2=VALUE2',], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -129,7 +129,7 @@ $cfg = #test syntax error 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=asdf', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -142,7 +142,7 @@ $cfg = #valid syntax, hdfs operation through pig 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=fs -ls :INPDIR_HDFS:;', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -156,7 +156,7 @@ $cfg = #syntax check - valid syntax 'num' => 3, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','arg=-check', 'file=:INPDIR_HDFS:/loadstore.pig', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -170,7 +170,7 @@ $cfg = #syntax check cmd - valid syntax 'num' => 4, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-d', 'arg=INFO' , 'execute=fs -ls :INPDIR_HDFS: ', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -185,7 +185,7 @@ $cfg = #a simple load store script 'num' => 5, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/loadstore.pig', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -202,7 +202,7 @@ $cfg = #pig query registering jar 'num' => 6, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/jarregistered.pig', 'files=:INPDIR_HDFS:/piggybank.jar' ], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -218,7 +218,7 @@ $cfg = #macro 'num' => 7, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/rowcount_withmacro.pig', 'files=:INPDIR_HDFS:/rowcountmacro.pig' ], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -234,7 +234,7 @@ $cfg = #no file to be copied, should result in launcher job error 'num' => 8, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:','arg=-p', 'arg=OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/no_such_file.pig', 'files=:INPDIR_HDFS:/rowcountmacro.pig' ], 'json_field_substr_match' => { 'error' => 'does not exist'}, @@ -291,7 +291,7 @@ $cfg = } ], 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/pig', + 'url' => ':TEMPLETON_URL:/templeton/v1/pig?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'arg=-useHCatalog', 'arg=-p', 'arg=INPDIR=:INPDIR_HDFS:', 'arg=-p', 'arg= OUTDIR=:OUTDIR:', 'file=:INPDIR_HDFS:/hcatloadstore.pig'], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -318,7 +318,7 @@ $cfg = #test syntax error 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=asdf', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -332,7 +332,7 @@ $cfg = #test show tables 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=show tables', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -362,7 +362,7 @@ $cfg = #test show tables 'num' => 4, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=create external table mynums(a int, b int) location \':INPDIR_HDFS:/numstable/\';', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -377,7 +377,7 @@ $cfg = #test describe 'num' => 5, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=describe formatted mynums', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -392,7 +392,7 @@ $cfg = #test select * 'num' => 6, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=select * from mynums', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -407,7 +407,7 @@ $cfg = #test select a,b 'num' => 7,#seems to be the same as test 6 except for percent_complete check 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=select count(*) from mynums', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -425,7 +425,7 @@ $cfg = #test udfs : select a,rand(b) 'num' => 8, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=select a,rand(b) from mynums', ], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -442,7 +442,7 @@ $cfg = # for this case when jar is shipped, #10 is a negative test case 'num' => 9, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar', 'files=:INPDIR_HDFS:/piggybank.jar',], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -457,7 +457,7 @@ $cfg = # controller job using "files" 'num' => 10, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar',], 'json_field_substr_match' => { 'id' => '\d+'}, #results @@ -486,7 +486,7 @@ $cfg = #test add jar when the jar is not shipped 'num' => 12, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/hive', + 'url' => ':TEMPLETON_URL:/templeton/v1/hive?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','execute=add jar piggybank.jar',], 'json_field_substr_match' => { 'id' => '\d+'}, #results diff --git hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf index de2743e..8830b2c 100644 --- hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf +++ hcatalog/src/test/e2e/templeton/tests/jobsubmission2.conf @@ -44,7 +44,7 @@ $cfg = # -mt must be greater than mapred.task.timeout (600000ms) 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','arg=-mt', 'arg=642000', 'jar=:INPDIR_HDFS:/hclient.jar', 'class=sleep', 'statusdir=/tmp/TestHeartbeat_1' ], diff --git hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf index 9b85796..25385a7 100644 --- hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf +++ hcatalog/src/test/e2e/templeton/tests/jobsubmission_streaming.conf @@ -41,7 +41,7 @@ $cfg = { 'num' => 1, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt','output=:OUTDIR:/mycounts', 'mapper=cat', 'reducer=wc'], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -61,7 +61,7 @@ $cfg = # job and thus is always SUCCCESS(2)/KILLED(5) once the job completes. 'num' => 2, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt','output=:OUTDIR:/mycounts', 'mapper=ls no_such-file-12e3', 'reducer=wc'], 'json_field_substr_match' => { 'id' => '\d+'}, @@ -77,7 +77,7 @@ $cfg = 'num' => 3, 'ignore23' => 'Log collector does not work with Hadoop 2', 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:', 'input=:INPDIR_HDFS:/nums.txt','input=:INPDIR_HDFS:/nums.txt', 'output=:OUTDIR:/mycounts', @@ -114,7 +114,7 @@ $cfg = #streaming xml 'num' => 5, 'method' => 'POST', - 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming', + 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/streaming?user.name=:UNAME:', 'post_options' => ['user.name=:UNAME:','input=:INPDIR_HDFS:/xml/file1.xml','input=:INPDIR_HDFS:/xml/file2.xml','output=:OUTDIR:/xmlout', 'mapper=python :INPDIR_HDFS:/xmlmapper.py','reducer=python :INPDIR_HDFS:/xmlreducer.py', 'inputreader="StreamXmlRecordReader,begin=xml,end=/xml"'], 'json_field_substr_match' => { 'id' => '\d+'}, diff --git hcatalog/src/test/e2e/templeton/tests/serverstatus.conf hcatalog/src/test/e2e/templeton/tests/serverstatus.conf index a2ebbd0..b18ffee 100644 --- hcatalog/src/test/e2e/templeton/tests/serverstatus.conf +++ hcatalog/src/test/e2e/templeton/tests/serverstatus.conf @@ -42,7 +42,7 @@ $cfg = #types supported 'num' => 1, 'method' => 'GET', - 'url' => ':TEMPLETON_URL:/templeton/v1', + 'url' => ':TEMPLETON_URL:/templeton/v1?user.name=:UNAME:', 'status_code' => 200, }, ] @@ -56,7 +56,7 @@ $cfg = #versions supported 'num' => 1, 'method' => 'GET', - 'url' => ':TEMPLETON_URL:/templeton/v1/version', + 'url' => ':TEMPLETON_URL:/templeton/v1/version?user.name=:UNAME:', 'status_code' => 200, 'json_field_substr_match' => {'version' => 'v1'}, 'json_field_match_object' => {'supportedVersions' => '["v1"]'}