Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f67c3861 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f67c3861 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f67c3861 Branch: refs/heads/1.5.2-SNAPSHOT Commit: f67c3861481835b09c12da6bb54887af31a68b52 Parents: 2df0eb8 0f63924 Author: Mike Drob <md...@cloudera.com> Authored: Fri Apr 4 16:15:54 2014 -0700 Committer: Mike Drob <md...@cloudera.com> Committed: Fri Apr 4 16:15:54 2014 -0700 ---------------------------------------------------------------------- test/system/auto/simple/examples.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f67c3861/test/system/auto/simple/examples.py ---------------------------------------------------------------------- diff --cc test/system/auto/simple/examples.py index 749f018,a728ec1..c75d450 --- a/test/system/auto/simple/examples.py +++ b/test/system/auto/simple/examples.py @@@ -64,16 -68,9 +64,16 @@@ class Examples(TestUtilsMixin, unittest self.wait(self.runOn('localhost', cmd)) def runTest(self): - examplesJar = glob.glob(ACCUMULO_HOME+'/lib/accumulo-examples-simple*.jar')[0] ++ examplesJar = glob.glob(os.path.join(ACCUMULO_HOME, 'lib', 'examples-simple*[!javadoc|sources].jar')) + self.comment("Testing MaxMutation constraint") + self.ashell('createtable test_ingest\n' + 'constraint -a org.apache.accumulo.examples.simple.constraints.MaxMutationSize\n') + handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.test.TestIngest', '-u', ROOT, '--rows', '1', '--start', '0', '--cols', '10000', '-p', ROOT_PASSWORD]) + out, err = handle.communicate() + self.failIf(handle.returncode==0) + self.failUnless(err.find("MutationsRejectedException: # constraint violations : 1") >= 0, "Was able to insert a mutation larger than max size") + self.ashell('createtable %s\nsetauths -u %s -s A,B\nquit\n' %(table, ROOT)) - examplesJar = glob.glob(os.path.join(ACCUMULO_HOME, 'lib', 'examples-simple*[!javadoc|sources].jar'))[0] - self.comment("Testing dirlist example (a little)") self.comment(" ingesting accumulo source") self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.dirlist.Ingest',
