Refactoring in rebaseline.py: Combine BaseInternalRebaselineCommand and AbstractRebaseliningCommand.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

 # Copyright (c) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 31 matching lines @@
 from webkitpy.tool.commands.command import Command
 
 
 _log = logging.getLogger(__name__)
 
 
 class AbstractRebaseliningCommand(Command):
     """Base class for rebaseline-related commands."""
     # Not overriding execute() - pylint: disable=abstract-method
 
-    no_optimize_option = optparse.make_option('--no-optimize', dest='optimize', action='store_false', default=True,
-                                              help=('Do not optimize (de-duplicate) the expectations after rebaselining '
-                                                    '(default is to de-dup automatically). '
-                                                    'You can use "webkit-patch optimize-baselines" to optimize separately.'))
-
+    no_optimize_option = optparse.make_option(
+        '--no-optimize', dest='optimize', action='store_false', default=True,
+        help=('Do not optimize (de-duplicate) the expectations after rebaselining '
+              '(default is to de-dupe automatically). You can use "webkit-patch '
+              'optimize-baselines" to optimize separately.'))
     platform_options = factory.platform_options(use_globs=True)
-
-    results_directory_option = optparse.make_option("--results-directory", help="Local results directory to use.")
-
-    suffixes_option = optparse.make_option("--suffixes", default=','.join(BASELINE_SUFFIX_LIST), action="store",
-                                           help="Comma-separated-list of file types to rebaseline.")
+    results_directory_option = optparse.make_option(
+        '--results-directory', help='Local results directory to use.')
+    suffixes_option = optparse.make_option(
+        '--suffixes', default=','.join(BASELINE_SUFFIX_LIST), action='store',
+        help='Comma-separated-list of file types to rebaseline.')
+    builder_option = optparse.make_option(
+        '--builder', help='Builder to pull new baselines from.')
+    test_option = optparse.make_option('--test', help='Test to rebaseline.')
+    build_number_option = optparse.make_option(
+        '--build-number', default=None, type='int',
+        help='Optional build number; if not given, the latest build is used.')
 
     def __init__(self, options=None):
         super(AbstractRebaseliningCommand, self).__init__(options=options)
         self._baseline_suffix_list = BASELINE_SUFFIX_LIST
         self.expectation_line_changes = ChangeSet()
         self._tool = None
 
     def _print_expectation_line_changes(self):
         print(json.dumps(self.expectation_line_changes.to_dict()))
 
@@ skipping 46 matching lines @@
 
     def update(self, other):
         assert isinstance(other, ChangeSet)
         assert type(other.lines_to_remove) is dict
         for test in other.lines_to_remove:
             if test not in self.lines_to_remove:
                 self.lines_to_remove[test] = []
             self.lines_to_remove[test].extend(other.lines_to_remove[test])
 
 
-class BaseInternalRebaselineCommand(AbstractRebaseliningCommand):
-    """Base class for rebaseline-related commands that are intended to be used by other commands."""
-    # Not overriding execute() - pylint: disable=abstract-method
-
-    def __init__(self):
-        super(BaseInternalRebaselineCommand, self).__init__(options=[
-            self.results_directory_option,
-            self.suffixes_option,
-            optparse.make_option("--builder", help="Builder to pull new baselines from."),
-            optparse.make_option("--test", help="Test to rebaseline."),
-            optparse.make_option("--build-number", default=None, type="int",
-                                 help="Optional build number; if not given, the latest build is used."),
-        ])
-
-
-class CopyExistingBaselinesInternal(BaseInternalRebaselineCommand):
+class CopyExistingBaselinesInternal(AbstractRebaseliningCommand):
     name = "copy-existing-baselines-internal"
     help_text = ("Copy existing baselines down one level in the baseline order to ensure "
                  "new baselines don't break existing passing platforms.")
 
+    def __init__(self):
+        super(CopyExistingBaselinesInternal, self).__init__(options=[
+            self.results_directory_option,
+            self.suffixes_option,
+            self.builder_option,
+            self.test_option,
+        ])
+
     @memoized
     def _immediate_predecessors_in_fallback(self, path_to_rebaseline):
         port_names = self._tool.port_factory.all_port_names()
         immediate_predecessors = []
         for port_name in port_names:
             port = self._tool.port_factory.get(port_name)
             if not port.buildbot_archives_baselines():
                 continue
             baseline_search_path = port.baseline_search_path()
             try:
@@ skipping 47 matching lines @@
             _log.debug("Copying baseline from %s to %s.", old_baseline, new_baseline)
             self._tool.filesystem.maybe_make_directory(self._tool.filesystem.dirname(new_baseline))
             self._tool.filesystem.copyfile(old_baseline, new_baseline)
 
     def execute(self, options, args, tool):
         self._tool = tool
         for suffix in options.suffixes.split(','):
             self._copy_existing_baseline(options.builder, options.test, suffix)
 
 
-class RebaselineTest(BaseInternalRebaselineCommand):
+class RebaselineTest(AbstractRebaseliningCommand):
     name = "rebaseline-test-internal"
     help_text = "Rebaseline a single test from a buildbot. Only intended for use by other webkit-patch commands."
 
+    def __init__(self):
+        super(RebaselineTest, self).__init__(options=[
+            self.results_directory_option,
+            self.suffixes_option,
+            self.builder_option,
+            self.test_option,
+            self.build_number_option,
+        ])
+
     def _save_baseline(self, data, target_baseline):
         if not data:
             _log.debug("No baseline data to save.")
             return
 
         filesystem = self._tool.filesystem
         filesystem.maybe_make_directory(filesystem.dirname(target_baseline))
         filesystem.write_binary_file(target_baseline, data)
 
     def _rebaseline_test(self, builder_name, test_name, suffix, results_url):
@@ skipping 476 matching lines @@
             for test in args:
                 if test not in test_prefix_list:
                     test_prefix_list[test] = {}
                 build = Build(builder)
                 test_prefix_list[test][build] = suffixes_to_update
 
         if options.verbose:
             _log.debug("rebaseline-json: " + str(test_prefix_list))
 
         self.rebaseline(options, test_prefix_list)