Changeset 90410 in webkit

Timestamp:

Jul 5, 2011 3:52:01 PM (13 years ago)

Author:

abarth@webkit.org

Message:

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

Add trivial garden-o-matic command (with server)
​https://bugs.webkit.org/show_bug.cgi?id=63872

Reviewed by Eric Seidel.

This patch adds a trivial "Hello, world" garden-o-matic command,
complete with an HTTP server. This command re-uses a bunch of code
from the existing rebaseline-server command. Over time, this command
will grow to be a tool useful for gardening the WebKit tree.

• Scripts/webkitpy/tool/commands/init.py:
• Scripts/webkitpy/tool/commands/abstractservercommand.py: Added.
• Scripts/webkitpy/tool/commands/gardenomatic.py: Added.
• Scripts/webkitpy/tool/commands/rebaselineserver.py:
• Scripts/webkitpy/tool/servers/data/gardeningserver/index.html: Added.
• Scripts/webkitpy/tool/servers/gardeningserver.py: Added.
• Scripts/webkitpy/tool/servers/rebaselineserver.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/__init__.py (modified) (1 diff)
• Scripts/webkitpy/tool/commands/abstractlocalservercommand.py (added)
• Scripts/webkitpy/tool/commands/gardenomatic.py (added)
• Scripts/webkitpy/tool/commands/rebaselineserver.py (modified) (5 diffs)
• Scripts/webkitpy/tool/servers/data/gardeningserver (added)
• Scripts/webkitpy/tool/servers/data/gardeningserver/index.html (added)
• Scripts/webkitpy/tool/servers/gardeningserver.py (added)
• Scripts/webkitpy/tool/servers/rebaselineserver.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-05  Adam Barth  <abarth@webkit.org>
+
+        Add trivial garden-o-matic command (with server)
+        https://bugs.webkit.org/show_bug.cgi?id=63872
+
+        Reviewed by Eric Seidel.
+
+        This patch adds a trivial "Hello, world" garden-o-matic command,
+        complete with an HTTP server.  This command re-uses a bunch of code
+        from the existing rebaseline-server command.  Over time, this command
+        will grow to be a tool useful for gardening the WebKit tree.
+
+        * Scripts/webkitpy/tool/commands/__init__.py:
+        * Scripts/webkitpy/tool/commands/abstractservercommand.py: Added.
+        * Scripts/webkitpy/tool/commands/gardenomatic.py: Added.
+        * Scripts/webkitpy/tool/commands/rebaselineserver.py:
+        * Scripts/webkitpy/tool/servers/data/gardeningserver/index.html: Added.
+        * Scripts/webkitpy/tool/servers/gardeningserver.py: Added.
+        * Scripts/webkitpy/tool/servers/rebaselineserver.py:
+
 2011-07-05  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py

@@ -1 +1 @@
 # Required for Python to search this directory for module files
 
+from webkitpy.tool.commands.bugfortest import BugForTest
 from webkitpy.tool.commands.bugsearch import BugSearch
-from webkitpy.tool.commands.bugfortest import BugForTest
 from webkitpy.tool.commands.download import *
 from webkitpy.tool.commands.earlywarningsystem import *
+from webkitpy.tool.commands.gardenomatic import GardenOMatic
 from webkitpy.tool.commands.openbugs import OpenBugs
 from webkitpy.tool.commands.prettydiff import PrettyDiff

trunk/Tools/Scripts/webkitpy/tool/commands/rebaselineserver.py

@@ -33 +33 @@
 import os
 import os.path
-import threading
-
-from optparse import make_option
 
 from webkitpy.common import system
@@ -41 +38 @@
 from webkitpy.layout_tests.layout_package import json_results_generator
 from webkitpy.layout_tests.port import factory
-from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
+from webkitpy.tool.commands.abstractlocalservercommand import AbstractLocalServerCommand
 from webkitpy.tool.servers.rebaselineserver import RebaselineHTTPServer, STATE_NEEDS_REBASELINE
 
@@ -55 +52 @@
 
 
-class RebaselineServer(AbstractDeclarativeCommand):
+class RebaselineServer(AbstractLocalServerCommand):
     name = "rebaseline-server"
     help_text = __doc__
     argument_names = "/path/to/results/directory"
 
-    def __init__(self):
-        options = [
-            make_option("--httpd-port", action="store", type="int", default=8127, help="Port to use for the the rebaseline HTTP server"),
-        ]
-        AbstractDeclarativeCommand.__init__(self, options=options)
+    server = RebaselineHTTPServer
 
-    def execute(self, options, args, tool):
+    def _prepare_config(self, options, args, tool):
         results_directory = args[0]
         filesystem = system.filesystem.FileSystem()
         scm = self._tool.scm()
-
-        if options.dry_run:
-
-            def no_op_copyfile(src, dest):
-                pass
-
-            def no_op_add(path, return_exit_code=False):
-                if return_exit_code:
-                    return 0
-
-            filesystem.copyfile = no_op_copyfile
-            scm.add = no_op_add
 
         print 'Parsing unexpected_results.json...'
@@ -89 +70 @@
         port = factory.get()
         layout_tests_directory = port.layout_tests_dir()
-        platforms = filesystem.listdir(
-            filesystem.join(layout_tests_directory, 'platform'))
-        test_config = TestConfig(
-            port,
-            layout_tests_directory,
-            results_directory,
-            platforms,
-            filesystem,
-            scm)
+        platforms = filesystem.listdir(filesystem.join(layout_tests_directory, 'platform'))
+        test_config = TestConfig(port, layout_tests_directory, results_directory, platforms, filesystem, scm)
 
         print 'Gathering current baselines...'
@@ -113 +87 @@
         results_json['tests'] = new_tests_subtree
 
-        server_url = "http://localhost:%d/" % options.httpd_port
-        print "Starting server at %s" % server_url
-        print ("Use the 'Exit' link in the UI, %squitquitquit "
-            "or Ctrl-C to stop") % server_url
-
-        threading.Timer(
-            .1, lambda: self._tool.user.open_url(server_url)).start()
-
-        httpd = RebaselineHTTPServer(
-            httpd_port=options.httpd_port,
-            test_config=test_config,
-            results_json=results_json,
-            platforms_json={
+        return {
+            'test_config': test_config,
+            "results_json": results_json,
+            "platforms_json": {
                 'platforms': platforms,
                 'defaultPlatform': port.name(),
-            })
-        httpd.serve_forever()
+            },
+        }

trunk/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py

@@ -197 +197 @@
 
 class RebaselineHTTPServer(BaseHTTPServer.HTTPServer):
-    def __init__(self, httpd_port, test_config, results_json, platforms_json):
-        BaseHTTPServer.HTTPServer.__init__(self, ("", httpd_port), RebaselineHTTPRequestHandler)
-        self.test_config = test_config
-        self.results_json = results_json
-        self.platforms_json = platforms_json
+    def __init__(self, httpd_port, config):
+        server_name = ""
+        BaseHTTPServer.HTTPServer.__init__(self, (server_name, httpd_port), RebaselineHTTPRequestHandler)
+        self.test_config = config['test_config']
+        self.results_json = config['results_json']
+        self.platforms_json = config['platforms_json']