Changeset 148352 in webkit


Ignore:
Timestamp:
Apr 13, 2013 1:02:31 AM (11 years ago)
Author:
rniwa@webkit.org
Message:

Remove more Chromium specific code from webkitpy
https://bugs.webkit.org/show_bug.cgi?id=114552

Reviewed by Philippe Normand.

  • Scripts/webkitpy/common/host.py:

(Host.checkout):

  • Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:

(JSONResultsGeneratorBase):
(JSONResultsGeneratorBase.init):
(JSONResultsGeneratorBase._is_results_all_of_type):

  • Scripts/webkitpy/layout_tests/port/base.py:

(Port):
(Port.expected_filename):

  • Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args):

  • Scripts/webkitpy/tool/commands/queues.py:

(PatchProcessingQueue._new_port_name_from_old):
(CommitQueue.did_pass_testing_ews):

  • Scripts/webkitpy/tool/commands/rebaseline.py:

(RebaselineTest._results_url):
(Rebaseline._builder_with_name):

  • Scripts/webkitpy/tool/mocktool.py:

(MockTool.irc):

Location:
trunk/Tools
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r148349 r148352  
     12013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Remove more Chromium specific code from webkitpy
     4        https://bugs.webkit.org/show_bug.cgi?id=114552
     5
     6        Reviewed by Philippe Normand.
     7
     8        * Scripts/webkitpy/common/host.py:
     9        (Host.checkout):
     10        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
     11        (JSONResultsGeneratorBase):
     12        (JSONResultsGeneratorBase.__init__):
     13        (JSONResultsGeneratorBase._is_results_all_of_type):
     14        * Scripts/webkitpy/layout_tests/port/base.py:
     15        (Port):
     16        (Port.expected_filename):
     17        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
     18        (PerfTestsRunner._parse_args):
     19        * Scripts/webkitpy/tool/commands/queues.py:
     20        (PatchProcessingQueue._new_port_name_from_old):
     21        (CommitQueue.did_pass_testing_ews):
     22        * Scripts/webkitpy/tool/commands/rebaseline.py:
     23        (RebaselineTest._results_url):
     24        (Rebaseline._builder_with_name):
     25        * Scripts/webkitpy/tool/mocktool.py:
     26        (MockTool.irc):
     27
    1282013-04-13  Zan Dobersek  <zdobersek@igalia.com>
    229
  • trunk/Tools/Scripts/webkitpy/common/host.py

    r148185 r148352  
    9090        return self._checkout
    9191
    92     def buildbot_for_builder_name(self, name):
    93         if self.port_factory.get_from_builder_name(name).is_chromium():
    94             return self.chromium_buildbot()
    95         return self.buildbot
    96 
    9792    @memoized
    9893    def watch_list(self):
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

    r148185 r148352  
    189189    URL_FOR_TEST_LIST_JSON = "http://%s/testfile?builder=%s&name=%s&testlistjson=1&testtype=%s&master=%s"
    190190
    191     # FIXME: Remove generate_incremental_results once the reference to it in
    192     # http://src.chromium.org/viewvc/chrome/trunk/tools/build/scripts/slave/gtest_slave_utils.py
    193     # has been removed.
    194191    def __init__(self, port, builder_name, build_name, build_number,
    195192        results_file_base_path, builder_base_url,
     
    197194        test_results_server=None,
    198195        test_type="",
    199         master_name="",
    200         generate_incremental_results=None):
     196        master_name=""):
    201197        """Modifies the results.json file. Grabs it off the archive directory
    202198        if it is not found locally.
     
    646642        (e.g. all passes)."""
    647643        return len(results) == 1 and results[0][1] == type
    648 
    649 
    650 # Left here not to break anything.
    651 class JSONResultsGenerator(JSONResultsGeneratorBase):
    652     pass
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

    r148185 r148352  
    7474
    7575    # Subclasses override this. This should indicate the basic implementation
    76     # part of the port name, e.g., 'chromium-mac', 'win', 'gtk'; there is probably (?)
    77     # one unique value per class.
     76    # part of the port name, e.g., 'win', 'gtk'; there is probably (?) one unique value per class.
    7877
    7978    # FIXME: We should probably rename this to something like 'implementation_name'.
     
    486485            or '.png'.  This should not be None, but may be an empty string.
    487486        platform: the most-specific directory name to use to build the
    488             search list of directories, e.g., 'chromium-win', or
    489             'chromium-cg-mac-leopard' (we follow the WebKit format)
     487            search list of directories; e.g. 'mountainlion-wk2'
    490488        return_default: if True, returns the path to the generic expectation if nothing
    491489            else is found; if False, returns None.
  • trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

    r146150 r148352  
    8585            optparse.make_option("--platform",
    8686                help="Specify port/platform being tested (i.e. chromium-mac)"),
    87             optparse.make_option("--chromium",
    88                 action="store_const", const='chromium', dest='platform', help='Alias for --platform=chromium'),
    89             optparse.make_option("--chromium-android",
    90                 action="store_const", const='chromium-android', dest='platform', help='Alias for --platform=chromium-android'),
    9187            optparse.make_option("--builder-name",
    9288                help=("The name of the builder shown on the waterfall running this script e.g. google-mac-2.")),
  • trunk/Tools/Scripts/webkitpy/tool/commands/queues.py

    r147678 r148352  
    262262    # FIXME: This is a hack to map between the old port names and the new port names.
    263263    def _new_port_name_from_old(self, port_name, platform):
    264         # The new port system has no concept of xvfb yet.
    265         if port_name == 'chromium-xvfb':
    266             return 'chromium'
    267264        # ApplePort.determine_full_port_name asserts if the name doesn't include version.
    268265        if port_name == 'mac':
     
    382379
    383380    def did_pass_testing_ews(self, patch):
    384         # Currently, chromium-ews is the only testing EWS. Once there are more,
    385         # should make sure they all pass.
    386         status = self._tool.status_server.patch_status("chromium-ews", patch.id())
     381        # Only Mac and Mac WK2 run tests
     382        # FIXME: We shouldn't have to hard-code it here.
     383        status = self._tool.status_server.patch_status("mac", patch.id())
    387384        return status == self._pass_status
    388385
  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

    r148075 r148352  
    8989
    9090    def _results_url(self, builder_name):
    91         return self._tool.buildbot_for_builder_name(builder_name).builder_with_name(builder_name).latest_layout_test_results_url()
     91        return self._tool.buildbot.builder_with_name(builder_name).latest_layout_test_results_url()
    9292
    9393    def _baseline_directory(self, builder_name):
     
    466466
    467467    def _builder_with_name(self, name):
    468         return self._tool.buildbot_for_builder_name(name).builder_with_name(name)
     468        return self._tool.buildbot.builder_with_name(name)
    469469
    470470    def _tests_to_update(self, builder):
  • trunk/Tools/Scripts/webkitpy/tool/mocktool.py

    r138775 r148352  
    8484    def irc(self):
    8585        return self._irc
    86 
    87     def buildbot_for_builder_name(self, name):
    88         return MockBuildBot()
Note: See TracChangeset for help on using the changeset viewer.