Author: ecn Date: Fri May 3 13:27:06 2013 New Revision: 1478777 URL: http://svn.apache.org/r1478777 Log: ACCUMULO-1369 insert failures change return code
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/examples.py Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/trunk:r1478775 Merged /accumulo/branches/1.5:r1478775 Propchange: accumulo/trunk/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/assemble:r1478775 Merged /accumulo/branches/1.5/assemble:r1478775 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/core:r1478775 Merged /accumulo/branches/1.5/core:r1478775 Propchange: accumulo/trunk/examples/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/examples:r1478775 Merged /accumulo/branches/1.5/examples:r1478775 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:r1478775 Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1478775 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:r1478775 Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1478775 Propchange: accumulo/trunk/pom.xml ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/pom.xml:r1478775 Merged /accumulo/trunk/pom.xml:r1478775 Propchange: accumulo/trunk/server/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/server:r1478775 Merged /accumulo/trunk/server:r1478775 Propchange: accumulo/trunk/src/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src:r1478775 Merged /accumulo/branches/1.5/src:r1478775 Modified: accumulo/trunk/test/system/auto/simple/examples.py URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/examples.py?rev=1478777&r1=1478776&r2=1478777&view=diff ============================================================================== --- accumulo/trunk/test/system/auto/simple/examples.py (original) +++ accumulo/trunk/test/system/auto/simple/examples.py Fri May 3 13:27:06 2013 @@ -43,9 +43,9 @@ class Examples(TestUtilsMixin, unittest. def runExample(self, cmd): return self.wait(self.runOn(self.masterHost(), [self.accumulo_sh(),] + cmd)) - def ashell(self, input): + def ashell(self, input, expected = 0): out, err, code = self.shell(self.masterHost(), input + '\n') - self.assert_(code == 0) + self.assert_(code == expected) return out def comment(self, description): @@ -262,7 +262,7 @@ class Examples(TestUtilsMixin, unittest. 'insert r1 cf1 cq1 ABC', 'scan', 'quit' - ])) + ]), 1) self.comment("Performing some row operations") self.runExample(['org.apache.accumulo.simple.examples.client.RowOperations', '-i', INSTANCE_NAME,