Changeset 90532 in webkit
- Timestamp:
- Jul 6, 2011 8:55:20 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 added
- 24 edited
- 8 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r90528 r90532 1 2011-07-06 Adam Barth <abarth@webkit.org> 2 3 Move model classes out of layout_package and into models 4 https://bugs.webkit.org/show_bug.cgi?id=64053 5 6 Reviewed by Eric Seidel. 7 8 * Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py: 9 * Scripts/webkitpy/common/net/layouttestresults.py: 10 * Scripts/webkitpy/common/net/layouttestresults_unittest.py: 11 * Scripts/webkitpy/common/net/resultsjsonparser.py: 12 * Scripts/webkitpy/common/net/resultsjsonparser_unittest.py: 13 * Scripts/webkitpy/layout_tests/controllers/manager.py: 14 * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py: 15 * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py: 16 * Scripts/webkitpy/layout_tests/controllers/worker.py: 17 * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py: 18 * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py: 19 * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py: 20 * Scripts/webkitpy/layout_tests/layout_package/result_summary.py: Removed. 21 * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py: Removed. 22 * Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py: Removed. 23 * Scripts/webkitpy/layout_tests/layout_package/test_failures.py: Removed. 24 * Scripts/webkitpy/layout_tests/layout_package/test_failures_unittest.py: Removed. 25 * Scripts/webkitpy/layout_tests/layout_package/test_input.py: Removed. 26 * Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py: 27 * Scripts/webkitpy/layout_tests/layout_package/test_results.py: Removed. 28 * Scripts/webkitpy/layout_tests/layout_package/test_results_unittest.py: Removed. 29 * Scripts/webkitpy/layout_tests/models: Added. 30 * Scripts/webkitpy/layout_tests/models/__init__.py: Added. 31 * Scripts/webkitpy/layout_tests/models/result_summary.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/result_summary.py. 32 * Scripts/webkitpy/layout_tests/models/test_expectations.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py. 33 * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py. 34 * Scripts/webkitpy/layout_tests/models/test_failures.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py. 35 * Scripts/webkitpy/layout_tests/models/test_failures_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures_unittest.py. 36 * Scripts/webkitpy/layout_tests/models/test_input.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_input.py. 37 * Scripts/webkitpy/layout_tests/models/test_results.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_results.py. 38 * Scripts/webkitpy/layout_tests/models/test_results_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_unittest.py. 39 * Scripts/webkitpy/layout_tests/port/chromium.py: 40 * Scripts/webkitpy/layout_tests/views/printing.py: 41 * Scripts/webkitpy/layout_tests/views/printing_unittest.py: 42 * Scripts/webkitpy/style/checkers/test_expectations_unittest.py: 43 * Scripts/webkitpy/style_references.py: 44 * Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py: 45 * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py: 46 * Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py: 47 * Scripts/webkitpy/tool/commands/queues_unittest.py: 48 * Scripts/webkitpy/tool/commands/rebaseline.py: 49 1 50 2011-07-06 Dirk Pranke <dpranke@chromium.org> 2 51 -
trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py
r90495 r90532 31 31 from webkitpy.common.net.layouttestresults import LayoutTestResults 32 32 from webkitpy.common.net.buildbot import BuildBot, Builder, Build 33 from webkitpy.layout_tests. layout_packageimport test_results34 from webkitpy.layout_tests. layout_packageimport test_failures33 from webkitpy.layout_tests.models import test_results 34 from webkitpy.layout_tests.models import test_failures 35 35 from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup 36 36 -
trunk/Tools/Scripts/webkitpy/common/net/layouttestresults.py
r90520 r90532 33 33 from webkitpy.common.system.deprecated_logging import log 34 34 from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup, SoupStrainer 35 from webkitpy.layout_tests. layout_packageimport test_results36 from webkitpy.layout_tests. layout_packageimport test_failures35 from webkitpy.layout_tests.models import test_results 36 from webkitpy.layout_tests.models import test_failures 37 37 38 38 -
trunk/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py
r84633 r90532 31 31 from webkitpy.common.net.layouttestresults import LayoutTestResults, ORWTResultsHTMLParser 32 32 from webkitpy.common.system.outputcapture import OutputCapture 33 from webkitpy.layout_tests. layout_packageimport test_results34 from webkitpy.layout_tests. layout_packageimport test_failures33 from webkitpy.layout_tests.models import test_results 34 from webkitpy.layout_tests.models import test_failures 35 35 from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup 36 36 -
trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py
r85459 r90532 35 35 36 36 # FIXME: common should never import from new-run-webkit-tests, one of these files needs to move. 37 from webkitpy.layout_tests.layout_package import json_results_generator, test_expectations, test_results, test_failures 37 from webkitpy.layout_tests.layout_package import json_results_generator 38 from webkitpy.layout_tests.models import test_expectations, test_results, test_failures 38 39 39 40 -
trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py
r85459 r90532 30 30 31 31 from webkitpy.common.net.resultsjsonparser import ResultsJSONParser 32 from webkitpy.layout_tests. layout_packageimport test_results33 from webkitpy.layout_tests. layout_packageimport test_failures32 from webkitpy.layout_tests.models import test_results 33 from webkitpy.layout_tests.models import test_failures 34 34 35 35 -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
r90528 r90532 54 54 from webkitpy.layout_tests.layout_package import json_layout_results_generator 55 55 from webkitpy.layout_tests.layout_package import json_results_generator 56 from webkitpy.layout_tests.layout_package import test_expectations57 from webkitpy.layout_tests.layout_package import test_failures58 from webkitpy.layout_tests.layout_package import test_results59 56 from webkitpy.layout_tests.layout_package import test_results_uploader 60 from webkitpy.layout_tests.layout_package.result_summary import ResultSummary 61 from webkitpy.layout_tests.layout_package.test_input import TestInput 57 from webkitpy.layout_tests.models import test_expectations 58 from webkitpy.layout_tests.models import test_failures 59 from webkitpy.layout_tests.models import test_results 60 from webkitpy.layout_tests.models.test_input import TestInput 61 from webkitpy.layout_tests.models.result_summary import ResultSummary 62 62 from webkitpy.layout_tests.views import printing 63 63 -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py
r90528 r90532 45 45 from webkitpy.layout_tests import run_webkit_tests 46 46 from webkitpy.layout_tests.controllers.manager import Manager, natural_sort_key, test_key, TestRunInterruptedException, TestShard 47 from webkitpy.layout_tests. layout_package.result_summary import ResultSummary47 from webkitpy.layout_tests.models.result_summary import ResultSummary 48 48 from webkitpy.layout_tests.views import printing 49 49 from webkitpy.tool.mocktool import MockOptions -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
r90523 r90532 31 31 import time 32 32 33 from webkitpy.layout_tests.layout_package import test_result_writer 33 34 from webkitpy.layout_tests.port.driver import DriverInput, DriverOutput 34 from webkitpy.layout_tests.layout_package import test_expectations 35 from webkitpy.layout_tests.layout_package import test_failures 36 from webkitpy.layout_tests.layout_package import test_result_writer 37 from webkitpy.layout_tests.layout_package.test_results import TestResult 35 from webkitpy.layout_tests.models import test_expectations 36 from webkitpy.layout_tests.models import test_failures 37 from webkitpy.layout_tests.models.test_results import TestResult 38 38 39 39 -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py
r90523 r90532 38 38 from webkitpy.layout_tests.controllers import manager_worker_broker 39 39 from webkitpy.layout_tests.controllers import single_test_runner 40 from webkitpy.layout_tests.layout_package import test_expectations 41 from webkitpy.layout_tests.layout_package import test_results 40 from webkitpy.layout_tests.models import test_expectations 41 from webkitpy.layout_tests.models import test_results 42 42 43 43 44 _log = logging.getLogger(__name__) -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py
r90520 r90532 30 30 31 31 from webkitpy.layout_tests.layout_package import json_results_generator 32 from webkitpy.layout_tests. layout_packageimport test_expectations33 from webkitpy.layout_tests. layout_packageimport test_failures32 from webkitpy.layout_tests.models import test_expectations 33 from webkitpy.layout_tests.models import test_failures 34 34 import webkitpy.thirdparty.simplejson as simplejson 35 35 -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
r90520 r90532 36 36 37 37 from webkitpy.layout_tests.layout_package import test_results_uploader 38 39 38 import webkitpy.thirdparty.simplejson as simplejson 40 39 -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
r90520 r90532 35 35 from webkitpy.common.system import filesystem_mock 36 36 from webkitpy.layout_tests.layout_package import json_results_generator 37 from webkitpy.layout_tests. layout_packageimport test_expectations37 from webkitpy.layout_tests.models import test_expectations 38 38 from webkitpy.layout_tests.port import test 39 39 from webkitpy.thirdparty.mock import Mock -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py
r90520 r90532 32 32 33 33 from webkitpy.common.system.crashlogs import CrashLogs 34 from webkitpy.layout_tests. layout_packageimport test_failures34 from webkitpy.layout_tests.models import test_failures 35 35 36 36 -
trunk/Tools/Scripts/webkitpy/layout_tests/models/result_summary.py
r90520 r90532 33 33 import logging 34 34 35 import test_expectations 35 from webkitpy.layout_tests.models import test_expectations 36 from webkitpy.layout_tests.models.test_expectations import TestExpectations 36 37 37 _log = logging.getLogger("webkitpy.layout_tests.run_webkit_tests")38 38 39 TestExpectations = test_expectations.TestExpectations 39 _log = logging.getLogger(__file__) 40 40 41 41 -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
r90520 r90532 28 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 29 30 """Unit tests for test_expectations.py."""31 32 30 import unittest 33 31 34 32 from webkitpy.layout_tests import port 35 33 from webkitpy.layout_tests.port import base 36 from webkitpy.layout_tests. layout_package.test_expectations import *34 from webkitpy.layout_tests.models.test_expectations import * 37 35 38 36 class FunctionsTest(unittest.TestCase): -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py
r90520 r90532 28 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 29 30 """Classes for failures that occur during tests."""31 32 import test_expectations33 34 30 import cPickle 31 32 from webkitpy.layout_tests.models import test_expectations 35 33 36 34 -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures_unittest.py
r90520 r90532 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 """"Tests code paths not covered by the regular unit tests."""30 31 29 import unittest 32 30 33 from webkitpy.layout_tests. layout_package.test_failures import *31 from webkitpy.layout_tests.models.test_failures import * 34 32 35 33 -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_results.py
r90520 r90532 29 29 import cPickle 30 30 31 import test_failures31 from webkitpy.layout_tests.models import test_failures 32 32 33 33 -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_results_unittest.py
r90520 r90532 29 29 import unittest 30 30 31 from test_results import TestResult31 from webkitpy.layout_tests.models.test_results import TestResult 32 32 33 33 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
r90527 r90532 45 45 from webkitpy.common.system.path import cygpath 46 46 from webkitpy.common.system.zipfileset import ZipFileSet 47 from webkitpy.layout_tests. layout_packageimport test_expectations47 from webkitpy.layout_tests.models import test_expectations 48 48 from webkitpy.layout_tests.port.base import Port 49 49 from webkitpy.layout_tests.port.driver import Driver, DriverOutput -
trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py
r90526 r90532 36 36 from webkitpy.common.net import resultsjsonparser 37 37 from webkitpy.layout_tests.views.metered_stream import MeteredStream 38 from webkitpy.layout_tests. layout_packageimport test_expectations38 from webkitpy.layout_tests.models import test_expectations 39 39 40 40 # FIXME: Change this to __file__ when we can fix test-webkitpy's logging configuration. -
trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
r90526 r90532 39 39 from webkitpy.layout_tests import port 40 40 from webkitpy.layout_tests.controllers import manager 41 from webkitpy.layout_tests. layout_packageimport result_summary42 from webkitpy.layout_tests. layout_packageimport test_expectations43 from webkitpy.layout_tests. layout_packageimport test_failures44 from webkitpy.layout_tests. layout_packageimport test_results41 from webkitpy.layout_tests.models import result_summary 42 from webkitpy.layout_tests.models import test_expectations 43 from webkitpy.layout_tests.models import test_failures 44 from webkitpy.layout_tests.models import test_results 45 45 from webkitpy.layout_tests.views import printing 46 46 -
trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py
r90520 r90532 27 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 30 """Unit tests for test_expectations.py."""31 29 32 30 import os -
trunk/Tools/Scripts/webkitpy/style_references.py
r75575 r90532 47 47 from webkitpy.common.checkout.scm import detect_scm_system 48 48 from webkitpy.layout_tests import port 49 from webkitpy.layout_tests. layout_packageimport test_expectations49 from webkitpy.layout_tests.models import test_expectations 50 50 from webkitpy.thirdparty.autoinstalled import pep8 51 51 -
trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py
r90520 r90532 59 59 from webkitpy.layout_tests import port 60 60 from webkitpy.layout_tests import read_checksum_from_png 61 from webkitpy.layout_tests. layout_packageimport test_expectations61 from webkitpy.layout_tests.models import test_expectations 62 62 63 63 _log = logging.getLogger(__name__) -
trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py
r87626 r90532 35 35 from webkitpy.common.system.executive import ScriptError 36 36 from webkitpy.common.system.outputcapture import OutputCapture 37 from webkitpy.layout_tests. layout_packageimport test_results38 from webkitpy.layout_tests. layout_packageimport test_failures37 from webkitpy.layout_tests.models import test_results 38 from webkitpy.layout_tests.models import test_failures 39 39 from webkitpy.thirdparty.mock import Mock 40 40 from webkitpy.tool.bot.commitqueuetask import * -
trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py
r83614 r90532 32 32 from webkitpy.common.system.filesystem_mock import MockFileSystem 33 33 from webkitpy.common.system.outputcapture import OutputCapture 34 from webkitpy.layout_tests. layout_packageimport test_results35 from webkitpy.layout_tests. layout_packageimport test_failures34 from webkitpy.layout_tests.models import test_results 35 from webkitpy.layout_tests.models import test_failures 36 36 from webkitpy.thirdparty.mock import Mock 37 37 from webkitpy.tool.bot.flakytestreporter import FlakyTestReporter -
trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
r89868 r90532 33 33 from webkitpy.common.net.bugzilla import Attachment 34 34 from webkitpy.common.system.outputcapture import OutputCapture 35 from webkitpy.layout_tests. layout_packageimport test_results36 from webkitpy.layout_tests. layout_packageimport test_failures35 from webkitpy.layout_tests.models import test_results 36 from webkitpy.layout_tests.models import test_failures 37 37 from webkitpy.thirdparty.mock import Mock 38 38 from webkitpy.tool.commands.commandtest import CommandsTest -
trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
r90520 r90532 35 35 from webkitpy.common.net.layouttestresults import LayoutTestResults 36 36 from webkitpy.common.system.user import User 37 from webkitpy.layout_tests. layout_packageimport test_failures37 from webkitpy.layout_tests.models import test_failures 38 38 from webkitpy.layout_tests.port import factory 39 39 from webkitpy.tool.grammar import pluralize
Note: See TracChangeset
for help on using the changeset viewer.