Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2592)

Unified Diff: Tools/Scripts/webkitpy/layout_tests/port/base.py

Issue 17320009: Remove the 'http_lock' and 'file_lock' code from webkitpy. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix merge again Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Tools/Scripts/webkitpy/layout_tests/port/base.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py
index 1bf8b1fa50d90fc6e76abaebe4620ac2bfc4d507..a663201860bf6812fff152cec6b991ec2892ed9c 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -59,7 +59,6 @@ from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestEx
from webkitpy.layout_tests.models.test_configuration import TestConfiguration
from webkitpy.layout_tests.port import config as port_config
from webkitpy.layout_tests.port import driver
-from webkitpy.layout_tests.port import http_lock
from webkitpy.layout_tests.port import server_process
from webkitpy.layout_tests.port.factory import PortFactory
from webkitpy.layout_tests.servers import apache_http_server
@@ -956,10 +955,6 @@ class Port(object):
return False
return True
- def acquire_http_lock(self):
- self._http_lock = http_lock.HttpLock(None, filesystem=self._filesystem, executive=self._executive)
- self._http_lock.wait_for_httpd_lock()
-
def stop_helper(self):
"""Shut down the test helper if it is running. Do nothing if
it isn't, or it isn't available. If a port overrides start_helper()
@@ -978,10 +973,6 @@ class Port(object):
self._websocket_server.stop()
self._websocket_server = None
- def release_http_lock(self):
- if self._http_lock:
- self._http_lock.cleanup_http_lock()
-
def exit_code_from_summarized_results(self, unexpected_results):
"""Given summarized results, compute the exit code to be returned by new-run-webkit-tests.
Bots turn red when this function returns a non-zero value. By default, return the number of regressions

Powered by Google App Engine
This is Rietveld 408576698