Get rebaseline server running again

https://bugs.webkit.org/show_bug.cgi?id=69020

Reviewed by Adam Barth.

Make rebaseline server run again after r90337 (missing format_date_time
import, results_json wasn't outputting anything).

* Scripts/webkitpy/tool/servers/rebaselineserver.py:
* Scripts/webkitpy/tool/servers/reflectionhandler.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96252 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b6a0d75..650c1e5 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-09-28  Mihai Parparita  <mihaip@chromium.org>
+
+        Get rebaseline server running again
+        https://bugs.webkit.org/show_bug.cgi?id=69020
+
+        Reviewed by Adam Barth.
+
+        Make rebaseline server run again after r90337 (missing format_date_time
+        import, results_json wasn't outputting anything).
+
+        * Scripts/webkitpy/tool/servers/rebaselineserver.py:
+        * Scripts/webkitpy/tool/servers/reflectionhandler.py:
+
 2011-09-28  David Grogan  <dgrogan@chromium.org>
 
         Move dgrogan from contributor to committer

diff --git a/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py b/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
index 8ab979b..09db91a 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
+++ b/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
@@ -217,13 +217,13 @@ class RebaselineHTTPRequestHandler(ReflectionHandler):
     STATIC_FILE_DIRECTORY = os.path.join(os.path.dirname(__file__), "data", "rebaselineserver")
 
     def results_json(self):
-        return self.server.results_json
+        self._serve_json(self.server.results_json)
 
     def test_config(self):
-        return self.server.test_config
+        self._serve_json(self.server.test_config)
 
     def platforms_json(self):
-        return self.server.platforms_json
+        self._serve_json(self.server.platforms_json)
 
     def rebaseline(self):
         test = self.query['test'][0]

diff --git a/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py b/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py
index 9b6f299..db118af 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py
+++ b/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py
@@ -47,9 +47,9 @@ import shutil
 import threading
 import time
 import urlparse
+import wsgiref.handlers
 import BaseHTTPServer
 
-
 class ReflectionHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     # Subclasses should override.
     STATIC_FILE_NAMES = None
@@ -138,7 +138,7 @@ class ReflectionHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             if cacheable_seconds:
                 expires_time = (datetime.datetime.now() +
                     datetime.timedelta(0, cacheable_seconds))
-                expires_formatted = format_date_time(
+                expires_formatted = wsgiref.handlers.format_date_time(
                     time.mktime(expires_time.timetuple()))
                 self.send_header("Expires", expires_formatted)
             self.end_headers()