Merge "tools/matrix: bugfixes"

tools/matrix

@@ -93,15 +93,14 @@ class MatrixImportBenchmark(BenchmarkRunner):
             replicas=replicas,
             verbose=self._config.verbose,
         )
+        try:
             neo.start()
+            try:
                 neo_storage = neo.getZODBStorage()
                 if not self._config.threaded:
                     assert len(neo.getStorageList()) == storages
                     neo.expectOudatedCells(number=0)
-        # import
                 start = time()
-        try:
-            try:
                 neo_storage.copyTransactionsFrom(dfs_storage)
                 end = time()
                 size = dfs_storage.getSize()
@@ -110,14 +109,13 @@ class MatrixImportBenchmark(BenchmarkRunner):
                 else:
                     assert self._size == size
                 return end - start
+            finally:
+                neo.stop()
         except:
             traceback.print_exc()
             self.error_log += "Import with m=%s, s=%s, r=%s, p=%s:" % (
                 masters, storages, replicas, partitions)
             self.error_log += "\n%s\n" % ''.join(traceback.format_exc())
-                return None
-        finally:
-            neo.stop()
 
     def buildReport(self, storages, replicas, results):
         # draw an array with results
@@ -127,7 +125,7 @@ class MatrixImportBenchmark(BenchmarkRunner):
         fmt = '|' + '|'.join(['  %8s  '] * (len(replicas) + 1)) + '|\n'
         sep = '+' + '+'.join(['-' * 12] * (len(replicas) + 1)) + '+\n'
         report = sep
-        report += fmt % tuple(['S\R'] + range(0, len(replicas)))
+        report += fmt % tuple(['S\R'] + replicas)
         report += sep
         failures = 0
         speedlist = []