From 91247aecc45c6293c00bee30a88edda47e5c2368 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Thu, 1 Sep 2011 02:43:50 +0200 Subject: [PATCH] benchmark/test_browser: prepare merge with erp5.util --- erp5/util/benchmark/performance_tester.py | 6 +++--- erp5/util/benchmark/process.py | 2 +- erp5/util/benchmark/report.py | 2 +- erp5/util/benchmark/result.py | 2 +- erp5/util/benchmark/scalability_tester.py | 4 ++-- erp5/util/test_browser/browser.py | 4 ++-- erp5/util/test_browser/examples/testAddPerson.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/erp5/util/benchmark/performance_tester.py b/erp5/util/benchmark/performance_tester.py index 5226627680..e429b372b4 100755 --- a/erp5/util/benchmark/performance_tester.py +++ b/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 diff --git a/erp5/util/benchmark/process.py b/erp5/util/benchmark/process.py index a4cb723457..769be86d17 100644 --- a/erp5/util/benchmark/process.py +++ b/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 diff --git a/erp5/util/benchmark/report.py b/erp5/util/benchmark/report.py index fc1e27fad7..b7ed13719d 100755 --- a/erp5/util/benchmark/report.py +++ b/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 = [] diff --git a/erp5/util/benchmark/result.py b/erp5/util/benchmark/result.py index 2005a163b2..94f44d4392 100644 --- a/erp5/util/benchmark/result.py +++ b/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 diff --git a/erp5/util/benchmark/scalability_tester.py b/erp5/util/benchmark/scalability_tester.py index 749a4ab50d..3ce7acf57e 100755 --- a/erp5/util/benchmark/scalability_tester.py +++ b/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): diff --git a/erp5/util/test_browser/browser.py b/erp5/util/test_browser/browser.py index 2de5d348c0..8e64261391 100644 --- a/erp5/util/test_browser/browser.py +++ b/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 diff --git a/erp5/util/test_browser/examples/testAddPerson.py b/erp5/util/test_browser/examples/testAddPerson.py index 9e359a7b53..5a89fe461c 100755 --- a/erp5/util/test_browser/examples/testAddPerson.py +++ b/erp5/util/test_browser/examples/testAddPerson.py @@ -1,7 +1,7 @@ #!/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 -- 2.30.9