Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D532A1051A for ; Wed, 19 Feb 2014 22:24:48 +0000 (UTC) Received: (qmail 29205 invoked by uid 500); 19 Feb 2014 22:24:47 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 29075 invoked by uid 500); 19 Feb 2014 22:24:46 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 29035 invoked by uid 99); 19 Feb 2014 22:24:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Feb 2014 22:24:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6E1C8928584; Wed, 19 Feb 2014 22:24:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Wed, 19 Feb 2014 22:24:45 -0000 Message-Id: <17b60651d01f4a918afde0ddcbe22714@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: ACCUMULO-2385 fix error running test against hadoop 1.0 Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 494d69478 -> cfced4cf6 ACCUMULO-2385 fix error running test against hadoop 1.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4dd2d662 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4dd2d662 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4dd2d662 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 4dd2d662cabb8372acaba36d58820c804ecd53ed Parents: eea885a Author: Eric Newton Authored: Wed Feb 19 17:21:43 2014 -0500 Committer: Eric Newton Committed: Wed Feb 19 17:21:43 2014 -0500 ---------------------------------------------------------------------- test/system/auto/simple/mapreduce.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dd2d662/test/system/auto/simple/mapreduce.py ---------------------------------------------------------------------- diff --git a/test/system/auto/simple/mapreduce.py b/test/system/auto/simple/mapreduce.py index a63df9a..5ac06e6 100755 --- a/test/system/auto/simple/mapreduce.py +++ b/test/system/auto/simple/mapreduce.py @@ -71,6 +71,7 @@ class MapReduceTest(TestUtilsMixin,unittest.TestCase): start = globa(os.path.join('lib','accumulo-start.jar')) jcommander = globa(os.path.join('lib','jcommander.jar')) trace = globa(os.path.join('lib','accumulo-trace.jar')) + guava = globa(os.path.join('lib','guava.jar')) zkjar = globbase(os.getenv("ZOOKEEPER_HOME"),"zookeeper*[!javadoc|src|bin].jar") self.createInputTableInAccumulo(); #Arguments for the Example Class @@ -83,7 +84,7 @@ class MapReduceTest(TestUtilsMixin,unittest.TestCase): #MapReduce class to run mapred_class= [self.accumulo_sh(),self.example_class_to_run] #classes needed to run the mapreduce - libjars = ["-libjars",",".join([zkjar,thriftjar,examples,core,fate,trace,jcommander])] + libjars = ["-libjars",",".join([zkjar,thriftjar,examples,core,fate,trace,jcommander,guava])] cmd = mapred_class+libjars+arg_list if(self.isAccumuloRunning()): log.debug("COMMAND:"+str(cmd))