You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2014/04/05 01:17:49 UTC
[1/6] git commit: ACCUMULO-2636 Fix globbing in python test
Repository: accumulo
Updated Branches:
refs/heads/1.4.6-SNAPSHOT 83e65f279 -> 0f6392400
refs/heads/1.5.2-SNAPSHOT 2df0eb89e -> f67c38614
refs/heads/1.6.0-SNAPSHOT 902446659 -> c60e3e593
ACCUMULO-2636 Fix globbing in python test
Funtional test was using globbing and picked up the sources jar instead of the compiled jar.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f639240
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f639240
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f639240
Branch: refs/heads/1.4.6-SNAPSHOT
Commit: 0f6392400d188b1177fde77fc4e645cfd617ff26
Parents: 83e65f2
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Apr 1 11:23:01 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Apr 4 16:14:56 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/0f639240/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index f05e58f..a728ec1 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -69,7 +69,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
def runTest(self):
self.ashell('createtable %s\nsetauths -u %s -s A,B\nquit\n' %(table, ROOT))
- examplesJar = glob.glob(ACCUMULO_HOME+'/lib/examples-simple*.jar')[0]
+ 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")
[5/6] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Posted by md...@apache.org.
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',
[6/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
(-sours)
Posted by md...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c60e3e59
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c60e3e59
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c60e3e59
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c60e3e593809b67b194a4e377e03bdcdb5c8e844
Parents: 9024466 f67c386
Author: Mike Drob <md...@cloudera.com>
Authored: Fri Apr 4 16:16:20 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Apr 4 16:16:20 2014 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: ACCUMULO-2636 Fix globbing in python test
Posted by md...@apache.org.
ACCUMULO-2636 Fix globbing in python test
Funtional test was using globbing and picked up the sources jar instead of the compiled jar.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f639240
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f639240
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f639240
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 0f6392400d188b1177fde77fc4e645cfd617ff26
Parents: 83e65f2
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Apr 1 11:23:01 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Apr 4 16:14:56 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/0f639240/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index f05e58f..a728ec1 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -69,7 +69,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
def runTest(self):
self.ashell('createtable %s\nsetauths -u %s -s A,B\nquit\n' %(table, ROOT))
- examplesJar = glob.glob(ACCUMULO_HOME+'/lib/examples-simple*.jar')[0]
+ 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")
[4/6] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Posted by md...@apache.org.
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.6.0-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',
[3/6] git commit: ACCUMULO-2636 Fix globbing in python test
Posted by md...@apache.org.
ACCUMULO-2636 Fix globbing in python test
Funtional test was using globbing and picked up the sources jar instead of the compiled jar.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f639240
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f639240
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f639240
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0f6392400d188b1177fde77fc4e645cfd617ff26
Parents: 83e65f2
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Apr 1 11:23:01 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Fri Apr 4 16:14:56 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/0f639240/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index f05e58f..a728ec1 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -69,7 +69,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
def runTest(self):
self.ashell('createtable %s\nsetauths -u %s -s A,B\nquit\n' %(table, ROOT))
- examplesJar = glob.glob(ACCUMULO_HOME+'/lib/examples-simple*.jar')[0]
+ 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")