Changeset 90532 in webkit


Ignore:
Timestamp:
Jul 6, 2011 8:55:20 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-07-06 Adam Barth <abarth@webkit.org>

Move model classes out of layout_package and into models
https://bugs.webkit.org/show_bug.cgi?id=64053

Reviewed by Eric Seidel.

  • Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py:
  • Scripts/webkitpy/common/net/layouttestresults.py:
  • Scripts/webkitpy/common/net/layouttestresults_unittest.py:
  • Scripts/webkitpy/common/net/resultsjsonparser.py:
  • Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:
  • Scripts/webkitpy/layout_tests/controllers/manager.py:
  • Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
  • Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
  • Scripts/webkitpy/layout_tests/controllers/worker.py:
  • Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
  • Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
  • Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
  • Scripts/webkitpy/layout_tests/layout_package/result_summary.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_expectations.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_failures.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_failures_unittest.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_input.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py:
  • Scripts/webkitpy/layout_tests/layout_package/test_results.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_results_unittest.py: Removed.
  • Scripts/webkitpy/layout_tests/models: Added.
  • Scripts/webkitpy/layout_tests/models/init.py: Added.
  • Scripts/webkitpy/layout_tests/models/result_summary.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/result_summary.py.
  • Scripts/webkitpy/layout_tests/models/test_expectations.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py.
  • Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_expectations_unittest.py.
  • Scripts/webkitpy/layout_tests/models/test_failures.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py.
  • Scripts/webkitpy/layout_tests/models/test_failures_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures_unittest.py.
  • Scripts/webkitpy/layout_tests/models/test_input.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_input.py.
  • Scripts/webkitpy/layout_tests/models/test_results.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_results.py.
  • Scripts/webkitpy/layout_tests/models/test_results_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_unittest.py.
  • Scripts/webkitpy/layout_tests/port/chromium.py:
  • Scripts/webkitpy/layout_tests/views/printing.py:
  • Scripts/webkitpy/layout_tests/views/printing_unittest.py:
  • Scripts/webkitpy/style/checkers/test_expectations_unittest.py:
  • Scripts/webkitpy/style_references.py:
  • Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py:
  • Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
  • Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py:
  • Scripts/webkitpy/tool/commands/queues_unittest.py:
  • Scripts/webkitpy/tool/commands/rebaseline.py:
Location:
trunk/Tools
Files:
2 added
24 edited
8 moved

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r90528 r90532  
     12011-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
    1502011-07-06  Dirk Pranke  <dpranke@chromium.org>
    251
  • trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py

    r90495 r90532  
    3131from webkitpy.common.net.layouttestresults import LayoutTestResults
    3232from webkitpy.common.net.buildbot import BuildBot, Builder, Build
    33 from webkitpy.layout_tests.layout_package import test_results
    34 from webkitpy.layout_tests.layout_package import test_failures
     33from webkitpy.layout_tests.models import test_results
     34from webkitpy.layout_tests.models import test_failures
    3535from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
    3636
  • trunk/Tools/Scripts/webkitpy/common/net/layouttestresults.py

    r90520 r90532  
    3333from webkitpy.common.system.deprecated_logging import log
    3434from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup, SoupStrainer
    35 from webkitpy.layout_tests.layout_package import test_results
    36 from webkitpy.layout_tests.layout_package import test_failures
     35from webkitpy.layout_tests.models import test_results
     36from webkitpy.layout_tests.models import test_failures
    3737
    3838
  • trunk/Tools/Scripts/webkitpy/common/net/layouttestresults_unittest.py

    r84633 r90532  
    3131from webkitpy.common.net.layouttestresults import LayoutTestResults, ORWTResultsHTMLParser
    3232from webkitpy.common.system.outputcapture import OutputCapture
    33 from webkitpy.layout_tests.layout_package import test_results
    34 from webkitpy.layout_tests.layout_package import test_failures
     33from webkitpy.layout_tests.models import test_results
     34from webkitpy.layout_tests.models import test_failures
    3535from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
    3636
  • trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser.py

    r85459 r90532  
    3535
    3636# 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
     37from webkitpy.layout_tests.layout_package import json_results_generator
     38from webkitpy.layout_tests.models import test_expectations, test_results, test_failures
    3839
    3940
  • trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py

    r85459 r90532  
    3030
    3131from webkitpy.common.net.resultsjsonparser import ResultsJSONParser
    32 from webkitpy.layout_tests.layout_package import test_results
    33 from webkitpy.layout_tests.layout_package import test_failures
     32from webkitpy.layout_tests.models import test_results
     33from webkitpy.layout_tests.models import test_failures
    3434
    3535
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

    r90528 r90532  
    5454from webkitpy.layout_tests.layout_package import json_layout_results_generator
    5555from webkitpy.layout_tests.layout_package import json_results_generator
    56 from webkitpy.layout_tests.layout_package import test_expectations
    57 from webkitpy.layout_tests.layout_package import test_failures
    58 from webkitpy.layout_tests.layout_package import test_results
    5956from 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
     57from webkitpy.layout_tests.models import test_expectations
     58from webkitpy.layout_tests.models import test_failures
     59from webkitpy.layout_tests.models import test_results
     60from webkitpy.layout_tests.models.test_input import TestInput
     61from webkitpy.layout_tests.models.result_summary import ResultSummary
    6262from webkitpy.layout_tests.views import printing
    6363
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py

    r90528 r90532  
    4545from webkitpy.layout_tests import run_webkit_tests
    4646from webkitpy.layout_tests.controllers.manager import Manager, natural_sort_key, test_key, TestRunInterruptedException, TestShard
    47 from webkitpy.layout_tests.layout_package.result_summary import ResultSummary
     47from webkitpy.layout_tests.models.result_summary import ResultSummary
    4848from webkitpy.layout_tests.views import printing
    4949from webkitpy.tool.mocktool import MockOptions
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

    r90523 r90532  
    3131import time
    3232
     33from webkitpy.layout_tests.layout_package import test_result_writer
    3334from 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
     35from webkitpy.layout_tests.models import test_expectations
     36from webkitpy.layout_tests.models import test_failures
     37from webkitpy.layout_tests.models.test_results import TestResult
    3838
    3939
  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py

    r90523 r90532  
    3838from webkitpy.layout_tests.controllers import manager_worker_broker
    3939from 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
     40from webkitpy.layout_tests.models import test_expectations
     41from webkitpy.layout_tests.models import test_results
     42
    4243
    4344_log = logging.getLogger(__name__)
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py

    r90520 r90532  
    3030
    3131from webkitpy.layout_tests.layout_package import json_results_generator
    32 from webkitpy.layout_tests.layout_package import test_expectations
    33 from webkitpy.layout_tests.layout_package import test_failures
     32from webkitpy.layout_tests.models import test_expectations
     33from webkitpy.layout_tests.models import test_failures
    3434import webkitpy.thirdparty.simplejson as simplejson
    3535
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

    r90520 r90532  
    3636
    3737from webkitpy.layout_tests.layout_package import test_results_uploader
    38 
    3938import webkitpy.thirdparty.simplejson as simplejson
    4039
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py

    r90520 r90532  
    3535from webkitpy.common.system import filesystem_mock
    3636from webkitpy.layout_tests.layout_package import json_results_generator
    37 from webkitpy.layout_tests.layout_package import test_expectations
     37from webkitpy.layout_tests.models import test_expectations
    3838from webkitpy.layout_tests.port import test
    3939from webkitpy.thirdparty.mock import Mock
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_result_writer.py

    r90520 r90532  
    3232
    3333from webkitpy.common.system.crashlogs import CrashLogs
    34 from webkitpy.layout_tests.layout_package import test_failures
     34from webkitpy.layout_tests.models import test_failures
    3535
    3636
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/result_summary.py

    r90520 r90532  
    3333import logging
    3434
    35 import test_expectations
     35from webkitpy.layout_tests.models import test_expectations
     36from webkitpy.layout_tests.models.test_expectations import TestExpectations
    3637
    37 _log = logging.getLogger("webkitpy.layout_tests.run_webkit_tests")
    3838
    39 TestExpectations = test_expectations.TestExpectations
     39_log = logging.getLogger(__file__)
    4040
    4141
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py

    r90520 r90532  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 """Unit tests for test_expectations.py."""
    31 
    3230import unittest
    3331
    3432from webkitpy.layout_tests import port
    3533from webkitpy.layout_tests.port import base
    36 from webkitpy.layout_tests.layout_package.test_expectations import *
     34from webkitpy.layout_tests.models.test_expectations import *
    3735
    3836class FunctionsTest(unittest.TestCase):
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py

    r90520 r90532  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 """Classes for failures that occur during tests."""
    31 
    32 import test_expectations
    33 
    3430import cPickle
     31
     32from webkitpy.layout_tests.models import test_expectations
    3533
    3634
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures_unittest.py

    r90520 r90532  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 """"Tests code paths not covered by the regular unit tests."""
    30 
    3129import unittest
    3230
    33 from webkitpy.layout_tests.layout_package.test_failures import *
     31from webkitpy.layout_tests.models.test_failures import *
    3432
    3533
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_results.py

    r90520 r90532  
    2929import cPickle
    3030
    31 import test_failures
     31from webkitpy.layout_tests.models import test_failures
    3232
    3333
  • trunk/Tools/Scripts/webkitpy/layout_tests/models/test_results_unittest.py

    r90520 r90532  
    2929import unittest
    3030
    31 from test_results import TestResult
     31from webkitpy.layout_tests.models.test_results import TestResult
    3232
    3333
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py

    r90527 r90532  
    4545from webkitpy.common.system.path import cygpath
    4646from webkitpy.common.system.zipfileset import ZipFileSet
    47 from webkitpy.layout_tests.layout_package import test_expectations
     47from webkitpy.layout_tests.models import test_expectations
    4848from webkitpy.layout_tests.port.base import Port
    4949from webkitpy.layout_tests.port.driver import Driver, DriverOutput
  • trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py

    r90526 r90532  
    3636from webkitpy.common.net import resultsjsonparser
    3737from webkitpy.layout_tests.views.metered_stream import MeteredStream
    38 from webkitpy.layout_tests.layout_package import test_expectations
     38from webkitpy.layout_tests.models import test_expectations
    3939
    4040# 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  
    3939from webkitpy.layout_tests import port
    4040from webkitpy.layout_tests.controllers import manager
    41 from webkitpy.layout_tests.layout_package import result_summary
    42 from webkitpy.layout_tests.layout_package import test_expectations
    43 from webkitpy.layout_tests.layout_package import test_failures
    44 from webkitpy.layout_tests.layout_package import test_results
     41from webkitpy.layout_tests.models import result_summary
     42from webkitpy.layout_tests.models import test_expectations
     43from webkitpy.layout_tests.models import test_failures
     44from webkitpy.layout_tests.models import test_results
    4545from webkitpy.layout_tests.views import printing
    4646
  • trunk/Tools/Scripts/webkitpy/style/checkers/test_expectations_unittest.py

    r90520 r90532  
    2727# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    29 
    30 """Unit tests for test_expectations.py."""
    3129
    3230import os
  • trunk/Tools/Scripts/webkitpy/style_references.py

    r75575 r90532  
    4747from webkitpy.common.checkout.scm import detect_scm_system
    4848from webkitpy.layout_tests import port
    49 from webkitpy.layout_tests.layout_package import test_expectations
     49from webkitpy.layout_tests.models import test_expectations
    5050from webkitpy.thirdparty.autoinstalled import pep8
    5151
  • trunk/Tools/Scripts/webkitpy/to_be_moved/rebaseline_chromium_webkit_tests.py

    r90520 r90532  
    5959from webkitpy.layout_tests import port
    6060from webkitpy.layout_tests import read_checksum_from_png
    61 from webkitpy.layout_tests.layout_package import test_expectations
     61from webkitpy.layout_tests.models import test_expectations
    6262
    6363_log = logging.getLogger(__name__)
  • trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

    r87626 r90532  
    3535from webkitpy.common.system.executive import ScriptError
    3636from webkitpy.common.system.outputcapture import OutputCapture
    37 from webkitpy.layout_tests.layout_package import test_results
    38 from webkitpy.layout_tests.layout_package import test_failures
     37from webkitpy.layout_tests.models import test_results
     38from webkitpy.layout_tests.models import test_failures
    3939from webkitpy.thirdparty.mock import Mock
    4040from webkitpy.tool.bot.commitqueuetask import *
  • trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter_unittest.py

    r83614 r90532  
    3232from webkitpy.common.system.filesystem_mock import MockFileSystem
    3333from webkitpy.common.system.outputcapture import OutputCapture
    34 from webkitpy.layout_tests.layout_package import test_results
    35 from webkitpy.layout_tests.layout_package import test_failures
     34from webkitpy.layout_tests.models import test_results
     35from webkitpy.layout_tests.models import test_failures
    3636from webkitpy.thirdparty.mock import Mock
    3737from webkitpy.tool.bot.flakytestreporter import FlakyTestReporter
  • trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py

    r89868 r90532  
    3333from webkitpy.common.net.bugzilla import Attachment
    3434from webkitpy.common.system.outputcapture import OutputCapture
    35 from webkitpy.layout_tests.layout_package import test_results
    36 from webkitpy.layout_tests.layout_package import test_failures
     35from webkitpy.layout_tests.models import test_results
     36from webkitpy.layout_tests.models import test_failures
    3737from webkitpy.thirdparty.mock import Mock
    3838from webkitpy.tool.commands.commandtest import CommandsTest
  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

    r90520 r90532  
    3535from webkitpy.common.net.layouttestresults import LayoutTestResults
    3636from webkitpy.common.system.user import User
    37 from webkitpy.layout_tests.layout_package import test_failures
     37from webkitpy.layout_tests.models import test_failures
    3838from webkitpy.layout_tests.port import factory
    3939from webkitpy.tool.grammar import pluralize
Note: See TracChangeset for help on using the changeset viewer.