Changeset 90526 in webkit


Ignore:
Timestamp:
Jul 6, 2011 7:45:58 PM (13 years ago)
Author:
abarth@webkit.org
Message:

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

Move view-related code out of layout_package and into views
​https://bugs.webkit.org/show_bug.cgi?id=64051

Reviewed by Eric Seidel.

  • Scripts/webkitpy/layout_tests/controllers/manager.py:
  • Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
  • Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py:
  • Scripts/webkitpy/layout_tests/controllers/manager_worker_broker_unittest.py:
  • Scripts/webkitpy/layout_tests/layout_package/metered_stream.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/printing.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py: Removed.
  • Scripts/webkitpy/layout_tests/run_webkit_tests.py:
  • Scripts/webkitpy/layout_tests/views: Added.
  • Scripts/webkitpy/layout_tests/views/init.py: Added.
  • Scripts/webkitpy/layout_tests/views/metered_stream.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/metered_stream.py.
  • Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py.
  • Scripts/webkitpy/layout_tests/views/printing.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py.
  • Scripts/webkitpy/layout_tests/views/printing_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py.
Location:
trunk/Tools
Files:
2 added
6 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r90524 r90526  
     12011-07-06  Adam Barth  <abarth@webkit.org>
     2
     3        Move view-related code out of layout_package and into views
     4        https://bugs.webkit.org/show_bug.cgi?id=64051
     5
     6        Reviewed by Eric Seidel.
     7
     8        * Scripts/webkitpy/layout_tests/controllers/manager.py:
     9        * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
     10        * Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py:
     11        * Scripts/webkitpy/layout_tests/controllers/manager_worker_broker_unittest.py:
     12        * Scripts/webkitpy/layout_tests/layout_package/metered_stream.py: Removed.
     13        * Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py: Removed.
     14        * Scripts/webkitpy/layout_tests/layout_package/printing.py: Removed.
     15        * Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py: Removed.
     16        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     17        * Scripts/webkitpy/layout_tests/views: Added.
     18        * Scripts/webkitpy/layout_tests/views/__init__.py: Added.
     19        * Scripts/webkitpy/layout_tests/views/metered_stream.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/metered_stream.py.
     20        * Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/metered_stream_unittest.py.
     21        * Scripts/webkitpy/layout_tests/views/printing.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py.
     22        * Scripts/webkitpy/layout_tests/views/printing_unittest.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py.
     23
    1242011-07-06  Adam Barth  <abarth@webkit.org>
    225

  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

    r90523 r90526  
    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 printing
    5756from webkitpy.layout_tests.layout_package import test_expectations
    5857from webkitpy.layout_tests.layout_package import test_failures
    5958from webkitpy.layout_tests.layout_package import test_results
    6059from webkitpy.layout_tests.layout_package import test_results_uploader
    61 
    6260from webkitpy.layout_tests.layout_package.result_summary import ResultSummary
    6361from webkitpy.layout_tests.layout_package.test_input import TestInput
     62from webkitpy.layout_tests.views import printing
    6463
    6564from webkitpy.thirdparty import simplejson

  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py

    r90523 r90526  
    4343from webkitpy.layout_tests import run_webkit_tests
    4444from webkitpy.layout_tests.controllers.manager import Manager, natural_sort_key, test_key, TestRunInterruptedException, TestShard
    45 from webkitpy.layout_tests.layout_package import printing
    4645from webkitpy.layout_tests.layout_package.result_summary import ResultSummary
     46from webkitpy.layout_tests.views import printing
    4747from webkitpy.tool.mocktool import MockOptions
    4848

  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py

    r90523 r90526  
    5959from webkitpy.layout_tests import port
    6060from webkitpy.layout_tests.controllers import message_broker
    61 from webkitpy.layout_tests.layout_package import printing
     61from webkitpy.layout_tests.views import printing
    6262
    6363

  • trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker_unittest.py

    r90523 r90526  
    4343from webkitpy.layout_tests.controllers import manager_worker_broker
    4444from webkitpy.layout_tests.controllers import message_broker
    45 from webkitpy.layout_tests.layout_package import printing
     45from webkitpy.layout_tests.views import printing
    4646
    4747# In order to reliably control when child workers are starting and stopping,

  • trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

    r90523 r90526  
    4343from webkitpy.layout_tests.controllers.manager import Manager, WorkerException
    4444from webkitpy.layout_tests.layout_package import json_results_generator
    45 from webkitpy.layout_tests.layout_package import printing
     45from webkitpy.layout_tests.views import printing
    4646
    4747from webkitpy.common.system import user

  • trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py

    r90520 r90526  
    3737package.
    3838"""
     39
    3940
    4041class MeteredStream:

  • trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py

    r90520 r90526  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 """Unit tests for metered_stream.py."""
    31 
    3230import unittest
    3331
    3432from webkitpy.common.array_stream import ArrayStream
    35 from webkitpy.layout_tests.layout_package import metered_stream
     33from webkitpy.layout_tests.views.metered_stream import MeteredStream
    3634
    3735
    … …  
    3937    def test_regular(self):
    4038        a = ArrayStream()
    41         m = metered_stream.MeteredStream(stream=a)
     39        m = MeteredStream(stream=a)
    4240        self.assertTrue(a.empty())
    4341

  • trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py

    r90520 r90526  
    3535
    3636from webkitpy.common.net import resultsjsonparser
    37 from webkitpy.layout_tests.layout_package import metered_stream
     37from webkitpy.layout_tests.views.metered_stream import MeteredStream
    3838from webkitpy.layout_tests.layout_package import test_expectations
    3939
    … …  
    221221        if self._stream.isatty() and not options.verbose:
    222222            self._update_interval_seconds = FAST_UPDATES_SECONDS
    223             self._meter = metered_stream.MeteredStream(self._stream)
     223            self._meter = MeteredStream(self._stream)
    224224            if configure_logging:
    225225                self._logging_handler = _configure_logging(self._meter, options.verbose)

  • trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py

    r90523 r90526  
    3939from webkitpy.layout_tests import port
    4040from webkitpy.layout_tests.controllers import manager
    41 from webkitpy.layout_tests.layout_package import printing
    4241from webkitpy.layout_tests.layout_package import result_summary
    4342from webkitpy.layout_tests.layout_package import test_expectations
    4443from webkitpy.layout_tests.layout_package import test_failures
    4544from webkitpy.layout_tests.layout_package import test_results
     45from webkitpy.layout_tests.views import printing
    4646
    4747
Note: See TracChangeset for help on using the changeset viewer.