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

Unified Diff: Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.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/controllers/layout_test_runner_unittest.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py b/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
index 240c3a61fdf90a4d989328c351ed6f891642b00a..e2258ac87330403f031a2d4c0a1ab6af63d07ea6 100644
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
@@ -104,16 +104,7 @@ class LayoutTestRunnerTests(unittest.TestCase):
def _run_tests(self, runner, tests):
test_inputs = [TestInput(test, 6000) for test in tests]
expectations = TestExpectations(runner._port, tests)
- runner.run_tests(expectations, test_inputs, set(),
- num_workers=1, needs_http=any('http' in test for test in tests), needs_websockets=any(['websocket' in test for test in tests]), retrying=False)
-
- def test_http_locking(self):
- runner = self._runner()
- self._run_tests(runner, ['http/tests/passes/text.html', 'passes/text.html'])
-
- def test_perf_locking(self):
- runner = self._runner()
- self._run_tests(runner, ['http/tests/passes/text.html', 'perf/foo/test.html'])
+ runner.run_tests(expectations, test_inputs, set(), num_workers=1, retrying=False)
def test_interrupt_if_at_failure_limits(self):
runner = self._runner()
@@ -164,58 +155,6 @@ class LayoutTestRunnerTests(unittest.TestCase):
self.assertEqual(0, run_results.expected)
self.assertEqual(1, run_results.unexpected)
- def test_servers_started(self):
-
- def start_http_server(number_of_servers=None):
- self.http_started = True
-
- def start_websocket_server():
- self.websocket_started = True
-
- def stop_http_server():
- self.http_stopped = True
-
- def stop_websocket_server():
- self.websocket_stopped = True
-
- host = MockHost()
- port = host.port_factory.get('test-mac-leopard')
- port.start_http_server = start_http_server
- port.start_websocket_server = start_websocket_server
- port.stop_http_server = stop_http_server
- port.stop_websocket_server = stop_websocket_server
-
- self.http_started = self.http_stopped = self.websocket_started = self.websocket_stopped = False
- runner = self._runner(port=port)
- runner._needs_http = True
- runner._needs_websockets = False
- runner.start_servers_with_lock(number_of_servers=4)
- self.assertEqual(self.http_started, True)
- self.assertEqual(self.websocket_started, False)
- runner.stop_servers_with_lock()
- self.assertEqual(self.http_stopped, True)
- self.assertEqual(self.websocket_stopped, False)
-
- self.http_started = self.http_stopped = self.websocket_started = self.websocket_stopped = False
- runner._needs_http = True
- runner._needs_websockets = True
- runner.start_servers_with_lock(number_of_servers=4)
- self.assertEqual(self.http_started, True)
- self.assertEqual(self.websocket_started, True)
- runner.stop_servers_with_lock()
- self.assertEqual(self.http_stopped, True)
- self.assertEqual(self.websocket_stopped, True)
-
- self.http_started = self.http_stopped = self.websocket_started = self.websocket_stopped = False
- runner._needs_http = False
- runner._needs_websockets = False
- runner.start_servers_with_lock(number_of_servers=4)
- self.assertEqual(self.http_started, False)
- self.assertEqual(self.websocket_started, False)
- runner.stop_servers_with_lock()
- self.assertEqual(self.http_stopped, False)
- self.assertEqual(self.websocket_stopped, False)
-
class SharderTests(unittest.TestCase):

Powered by Google App Engine
This is Rietveld 408576698