Index: testutils/ptest/hivetest.py =================================================================== --- testutils/ptest/hivetest.py (revision 1346138) +++ testutils/ptest/hivetest.py (working copy) @@ -87,7 +87,7 @@ master_base_path += '-' + suffix host_base_path += '-' + suffix - ant_path = master_base_path + '/apache-ant-1.8.2' + ant_path = master_base_path + '/apache-ant-1.8.4' arc_path = master_base_path + '/arcanist' phutil_path = master_base_path + '/libphutil' code_path = master_base_path + '/trunk' @@ -112,7 +112,7 @@ # Hadoop remote_set.export('HADOOP_HOME', host_code_path + - '/build/hadoopcore/hadoop-0.20.1') + '/build/ivy/hadoop0.20.shim') def get_ant(): # Gets Ant 1.8.2 from one of Apache mirrors. @@ -122,7 +122,7 @@ abandon_output = False) is None: local.run('mkdir -p "{0}"'.format(master_base_path)) local.cd(master_base_path) - local.run('curl "http://apache.osuosl.org//ant/binaries/apache-ant-1.8.2-bin.tar.gz" | tar xz') + local.run('curl "http://apache.osuosl.org//ant/binaries/apache-ant-1.8.4-bin.tar.gz" | tar xz') else: print('\n Ant 1.8.2 already installed\n') @@ -198,7 +198,7 @@ def build_hive(): print('\n-- Building Hive\n') local.cd(code_path) - local.run('ant package') + local.run('ant very-clean package') def propagate_hive(): # Expects master_base_path to be available on all test nodes in the same @@ -271,13 +271,13 @@ # if you need it for some reason). qfile_set.cd(host_code_path) - qfile_set.run('ant -Dtestcase=TestCliDriver -Doffline=true test', + qfile_set.run('ant -Dtestcase=TestCliDriver test', quiet = True, warn_only = True) collect_log('TEST-org.apache.hadoop.hive.cli.TestCliDriver.xml') collect_out('clientpositive') qfile_set.cd(host_code_path) - qfile_set.run('ant -Dtestcase=TestNegativeCliDriver -Doffline=true test', + qfile_set.run('ant -Dtestcase=TestNegativeCliDriver test', quiet = True, warn_only = True) collect_log('TEST-org.apache.hadoop.hive.cli.TestNegativeCliDriver.xml') collect_out('clientnegative') @@ -305,7 +305,7 @@ # Split all test cases between hosts. def get_command(test): return '; '.join([ - 'ant -Dtestcase=' + test + ' -Doffline=true test', + 'ant -Dtestcase=' + test + ' test', 'cp "`find . -name "TEST-*.xml"`" "' + report_path + '/logs/" || ' + 'touch "' + report_path + '/logs/{host}-' + test + '.fail"',