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 E99C3FE0E for ; Mon, 22 Apr 2013 19:52:24 +0000 (UTC) Received: (qmail 98164 invoked by uid 500); 22 Apr 2013 19:52:24 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 98138 invoked by uid 500); 22 Apr 2013 19:52:24 -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 98128 invoked by uid 99); 22 Apr 2013 19:52:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Apr 2013 19:52:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Apr 2013 19:52:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 327002388A2C; Mon, 22 Apr 2013 19:52:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1470685 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/system/auto/simple/ Date: Mon, 22 Apr 2013 19:52:01 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130422195201.327002388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Mon Apr 22 19:52:00 2013 New Revision: 1470685 URL: http://svn.apache.org/r1470685 Log: ACCUMULO-1211 new format breaks functional test Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) accumulo/trunk/test/system/auto/simple/simpleBalancer.py Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1470684 Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/assemble:r1470684 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1470684 Propchange: accumulo/trunk/examples/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/examples:r1470684 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1470684 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1470684 Propchange: accumulo/trunk/pom.xml ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/pom.xml:r1470684 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1470684 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/src:r1470684 Modified: accumulo/trunk/test/system/auto/simple/simpleBalancer.py URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/simpleBalancer.py?rev=1470685&r1=1470684&r2=1470685&view=diff ============================================================================== --- accumulo/trunk/test/system/auto/simple/simpleBalancer.py (original) +++ accumulo/trunk/test/system/auto/simple/simpleBalancer.py Mon Apr 22 19:52:00 2013 @@ -89,12 +89,12 @@ class SimpleBalancerFairness(SunnyDayTes # will be split evenly on both servers, not just one table = '' for line in out.split('\n'): - if line.find(' Name ') == 0: - server = line[6:] + if line.find(' Name: ') == 0: + server = line[7:] servers.setdefault(server, 0) - if line.find('Table ') >= 0: + if line.find('Table: ') >= 0: table = line.split(' ')[-1] - if line.find(' Tablets ') == 0: + if line.find(' Tablets: ') == 0: if table == '1': servers[server] += int(line.split()[-1]) log.info("Tablet counts " + repr(servers))