Author: ecn
Date: Mon Apr 22 19:30:35 2013
New Revision: 1470673
URL: http://svn.apache.org/r1470673
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/stress/metadataMaxFiles.py
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1470671
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1470671
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1470671
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1470671
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:r1470671
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:r1470671
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1470671
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1470671
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1470671
Modified: accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py?rev=1470673&r1=1470672&r2=1470673&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py (original)
+++ accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py Mon Apr 22
19:30:35 2013
@@ -54,7 +54,7 @@ class MetadataMaxFiles(TestUtilsMixin, u
h = self.runOn(self.masterHost(),
[self.accumulo_sh(),
'org.apache.accumulo.test.GetMasterStats'])
out, err = h.communicate()
- self.assert_(len([x for x in out.split('\n') if x.find(' Tablets
1001') == 0]) == 5)
+ self.assert_(len([x for x in out.split('\n') if x.find(' Tablets:
1001') == 0]) == 5)
def tearDown(self):
TestUtilsMixin.tearDown(self)
