Delete unused rebaseline method in gardeningserver.py

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

Reviewed by Eric Seidel.

As best I can tell, the only usage was in this unittest.

* Scripts/webkitpy/tool/servers/gardeningserver.py:
(GardeningHTTPRequestHandler.updateexpectations):
* Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
(GardeningServerTest.test_rebaseline_new_port):

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 1b7c9d0..e772472 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-02  Ojan Vafai  <ojan@chromium.org>
+
+        Delete unused rebaseline method in gardeningserver.py
+        https://bugs.webkit.org/show_bug.cgi?id=90396
+
+        Reviewed by Eric Seidel.
+
+        As best I can tell, the only usage was in this unittest.
+
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        (GardeningHTTPRequestHandler.updateexpectations):
+        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+        (GardeningServerTest.test_rebaseline_new_port):
+
 2012-07-02  Csaba Osztrogonác  <ossy@webkit.org>
 
         REGRESSION(r121497): It switched off and broke many unittests

diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
index 4415ee8..c83d65f 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
+++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
@@ -140,22 +140,6 @@ class GardeningHTTPRequestHandler(ReflectionHandler):
         self._expectations_updater().update_expectations(self._read_entity_body_as_json())
         self._serve_text('success')
 
-    # FIXME: Is this dead code?
-    def rebaseline(self):
-        builder = self.query['builder'][0]
-        command = [ 'rebaseline-test' ]
-
-        if 'suffixes' in self.query:
-            command.append('--suffixes')
-            command.append(self.query['suffixes'][0])
-
-        command.append(builder)
-        command.append(self.query['test'][0])
-
-        command.extend(builders.fallback_port_names_for_new_port(builder))
-        self._run_webkit_patch(command)
-        self._serve_text('success')
-
     def rebaselineall(self):
         command = ['rebaseline-all']
         self.server.tool.executive.run_command([self.server.tool.path()] + command, input=self.read_entity_body(), cwd=self.server.tool.scm().checkout_root)

diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
index d6dca47..c738a0d 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
@@ -200,9 +200,9 @@ class GardeningServerTest(unittest.TestCase):
 
     def test_rebaseline_new_port(self):
         builders._exact_matches = {"MOCK builder": {"port_name": "test-mac-leopard", "specifiers": set(["mock-specifier"]), "move_overwritten_baselines_to": ["mock-port-fallback", "mock-port-fallback2"]}}
-        expected_stderr = "MOCK run_command: ['echo', 'rebaseline-test', '--suffixes', 'txt,png', 'MOCK builder', 'user-scripts/another-test.html', 'mock-port-fallback', 'mock-port-fallback2'], cwd=/mock-checkout\n"
+        expected_stderr = 'MOCK run_command: [\'echo\', \'rebaseline-all\'], cwd=/mock-checkout, input={"user-scripts/another-test.html":{"MOCK builder": ["txt","png"]}}\n'
         expected_stdout = "== Begin Response ==\nsuccess\n== End Response ==\n"
-        self._post_to_path("/rebaseline?builder=MOCK+builder&test=user-scripts/another-test.html&suffixes=txt,png", expected_stderr=expected_stderr, expected_stdout=expected_stdout)
+        self._post_to_path("/rebaselineall", body='{"user-scripts/another-test.html":{"MOCK builder": ["txt","png"]}}', expected_stderr=expected_stderr, expected_stdout=expected_stdout)
 
     def test_updateexpectations(self):
         expected_stderr = ""