Index: ql/src/test/templates/TestCliDriver.vm =================================================================== --- ql/src/test/templates/TestCliDriver.vm (revision 753475) +++ ql/src/test/templates/TestCliDriver.vm (working copy) @@ -75,11 +75,13 @@ Map jobInfoMap = hv.getJobInfoMap(); Map taskInfoMap = hv.getTaskInfoMap(); - String cmd = (String)jobInfoMap.keySet().toArray()[0]; - QueryInfo ji = jobInfoMap.get(cmd); + if(jobInfoMap.size() != 0) { + String cmd = (String)jobInfoMap.keySet().toArray()[0]; + QueryInfo ji = jobInfoMap.get(cmd); - if (!ji.hm.get(Keys.QUERY_RET_CODE.name()).equals("0")) { - fail("Wrong return code in hive history"); + if (!ji.hm.get(Keys.QUERY_RET_CODE.name()).equals("0")) { + fail("Wrong return code in hive history"); + } } }