benchmark/test_browser: prepare merge with erp5.util

erp5/util/benchmark/performance_tester.py

@@ -36,9 +36,9 @@ import xmlrpclib
 import signal
 import errno
 
-from erp5.utils.benchmark.argument import ArgumentType
-from erp5.utils.benchmark.process import BenchmarkProcess
-from erp5.utils.benchmark.result import ERP5BenchmarkResult, CSVBenchmarkResult
+from .argument import ArgumentType
+from .process import BenchmarkProcess
+from .result import ERP5BenchmarkResult, CSVBenchmarkResult
 
 MAXIMUM_KEYBOARD_INTERRUPT = 5
 

erp5/util/benchmark/process.py

@@ -34,7 +34,7 @@ import logging
 import signal
 import sys
 
-from erp5.utils.test_browser.browser import Browser
+from ..test_browser.browser import Browser
 
 MAXIMUM_ERROR_COUNTER = 10
 RESULT_NUMBER_BEFORE_FLUSHING = 100

erp5/util/benchmark/report.py

@@ -63,7 +63,7 @@ def parseArguments():
 
 import csv
 
-from erp5.utils.benchmark.result import BenchmarkResultStatistic
+from .result import BenchmarkResultStatistic
 
 def computeStatisticFromFilenameList(argument_namespace, filename_list):
   reader_list = []

erp5/util/benchmark/result.py

@@ -103,7 +103,7 @@ class BenchmarkResult(object):
   def getLogger(self):
     if not self._logger:
       logging.basicConfig(stream=self.log_file, level=self._log_level)
-      self._logger = logging.getLogger('erp5.utils.benchmark')
+      self._logger = logging.getLogger('erp5.util.benchmark')
       return self._logger
 
     return self._logger

erp5/util/benchmark/scalability_tester.py

@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-from erp5.utils.benchmark.result import CSVBenchmarkResult
+from .result import CSVBenchmarkResult
 
 class CSVScalabilityBenchmarkResult(CSVBenchmarkResult):
   def flush(self, partial=True):
@@ -37,7 +37,7 @@ class CSVScalabilityBenchmarkResult(CSVBenchmarkResult):
                                            self._result_file.tell(),
                                            partial=partial)
 
-from erp5.utils.benchmark.performance_tester import PerformanceTester
+from .performance_tester import PerformanceTester
 
 class ScalabilityTester(PerformanceTester):
   def preRun(self, *args, **kwargs):

erp5/util/test_browser/browser.py

@@ -174,7 +174,7 @@ class Browser(ExtendedTestBrowser):
     stream = log_file and log_file or sys.stderr
     logging.basicConfig(stream=stream, level=logging_level)
 
-    self._logger = logging.getLogger('erp5.utils.test_browser')
+    self._logger = logging.getLogger('erp5.util.test_browser')
     self._is_legacy_listbox = is_legacy_listbox
     self._is_logged_in = False
 
@@ -964,7 +964,7 @@ class ContextMainForm(MainForm):
     from 1), excluding hidden control and those whose class is hidden
     too. The position of a cell from a column or line number can be
     obtained through calling
-    L{erp5.utils.test_browser.browser.Browser.getListboxPosition}.
+    L{erp5.util.test_browser.browser.Browser.getListboxPosition}.
 
     Also, there may be several elements within a cell, thus
     C{cell_element_index} allows to select which one to get (starting

erp5/util/test_browser/examples/testAddPerson.py

 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from erp5.utils.test_browser.browser import Browser
+from erp5.util.test_browser.browser import Browser
 
 ITERATION = 20