You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/07/24 23:48:05 UTC
[3/6] git commit: ACCUMULO-3016 Remove glob and use explicit file
name for examples-simple jar
ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar
We don't bundle javadoc or sources in the assemble anymore so there
is no reason to try to use the glob to exclude those. Also, the version
string is also not included in the artifacts which make it even more
straightforward.
Also removed two tabs on the following lines and replaced with the
correct spaces for indentation.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/10950b54
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/10950b54
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/10950b54
Branch: refs/heads/master
Commit: 10950b54cee2014278c8ad9554d0e3907e86a411
Parents: 87c609d
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 24 17:38:39 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 24 17:46:38 2014 -0400
----------------------------------------------------------------------
test/system/auto/simple/examples.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/10950b54/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index c75d450..90ba2db 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -19,7 +19,6 @@ import logging
import unittest
import time
import sys
-import glob
from TestUtils import TestUtilsMixin, ACCUMULO_HOME, SITE, ROOT, ROOT_PASSWORD, INSTANCE_NAME, ZOOKEEPERS
@@ -64,9 +63,9 @@ class Examples(TestUtilsMixin, unittest.TestCase):
self.wait(self.runOn('localhost', cmd))
def runTest(self):
- 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'
+ examplesJar = os.path.join(ACCUMULO_HOME, 'lib', 'accumulo-examples-simple.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()