accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1405498 - in /accumulo/trunk/test/system/bench/lib: Benchmark.py TeraSortBenchmark.py
Date Sun, 04 Nov 2012 03:59:58 GMT
Author: elserj
Date: Sun Nov  4 03:59:57 2012
New Revision: 1405498

URL: http://svn.apache.org/viewvc?rev=1405498&view=rev
Log:
ACCUMULO-827 Fix libjars for CloudStone3

Modified:
    accumulo/trunk/test/system/bench/lib/Benchmark.py
    accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py

Modified: accumulo/trunk/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/bench/lib/Benchmark.py?rev=1405498&r1=1405497&r2=1405498&view=diff
==============================================================================
--- accumulo/trunk/test/system/bench/lib/Benchmark.py (original)
+++ accumulo/trunk/test/system/bench/lib/Benchmark.py Sun Nov  4 03:59:57 2012
@@ -91,10 +91,7 @@ class Benchmark(unittest.TestCase):
         return 0
     
     def findjar(self, path):
-        globjar = glob.glob(path)
-        for j in globjar:
-            if j.find('javadoc') >= 0 or j.find('sources') >= 0:
-                globjar.remove(j)
+        globjar = [ j for j in glob.glob(path) if j.find('javadoc') == -1 and j.find('sources')
== -1 ]
         return globjar[0]
         
     # Returns the location of the local examples jar
@@ -105,9 +102,12 @@ class Benchmark(unittest.TestCase):
     def getjars(self, delim=','):
         accumulo_core_jar = self.findjar(accumulo('lib', 'accumulo-core*.jar'))
         accumulo_start_jar = self.findjar(accumulo('lib', 'accumulo-start*.jar'))
+        accumulo_fate_jar = self.findjar(accumulo('lib', 'accumulo-fate*.jar'))
+        cloudtrace_jar = self.findjar(accumulo('lib', 'cloudtrace*.jar'))
         accumulo_thrift_jar = self.findjar(accumulo('lib', 'libthrift*.jar'))
         accumulo_zookeeper_jar = self.findjar(os.path.join(os.getenv('ZOOKEEPER_HOME'), 'zookeeper*.jar'))
-        return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar,
accumulo_start_jar])
+        return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar,
accumulo_start_jar,
+            accumulo_fate_jar, cloudtrace_jar])
        
     # Builds the running command for the map/reduce class specified sans the arguments
     def buildcommand(self, classname, *args):

Modified: accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py?rev=1405498&r1=1405497&r2=1405498&view=diff
==============================================================================
--- accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py (original)
+++ accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py Sun Nov  4 03:59:57 2012
@@ -88,6 +88,7 @@ class TeraSortBenchmark(Benchmark):
         log.debug("Running: %r", command)
         out, err = handle.communicate("")
         log.debug("Process finished: %d (%s)", handle.returncode, ' '.join(handle.command))
+        self.assertEqual(handle.returncode, 0, "Job did not complete successfully")
         return handle.returncode, out, err
         
     def needsAuthentication(self):



Mime
View raw message