Remove webkitpy.thirdparty.mock, webkitpy.common.webkitunittest.

Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 """Unit tests for manager.py."""
 
 import sys
 import time
 import unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.controllers.manager import Manager
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models.test_run_results import TestRunResults
-from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.mocktool import MockOptions
 
 
+class FakePrinter(object):
+    def write_update(self, s):
+        pass
+
+
 class ManagerTest(unittest.TestCase):
     def test_needs_servers(self):
         def get_manager():
-            port = Mock()  # FIXME: Use a tighter mock.
-            port.TEST_PATH_SEPARATOR = '/'
-            manager = Manager(port, options=MockOptions(http=True, max_locked_shards=1), printer=Mock())
+            host = MockHost()
+            port = host.port_factory.get('test-mac-leopard')
+            manager = Manager(port, options=MockOptions(http=True, max_locked_shards=1), printer=FakePrinter())
             return manager
 
         manager = get_manager()
         self.assertFalse(manager.needs_servers(['fast/html']))
 
         manager = get_manager()
         self.assertTrue(manager.needs_servers(['http/tests/misc']))
 
     def test_servers_started(self):
         def get_manager(port):
-            manager = Manager(port, options=MockOptions(http=True, max_locked_shards=1), printer=Mock())
+            manager = Manager(port, options=MockOptions(http=True, max_locked_shards=1), printer=FakePrinter())
             return manager
 
         def start_http_server(additional_dirs, number_of_drivers):
             self.http_started = True
 
         def start_websocket_server():
             self.websocket_started = True
 
         def stop_http_server():
             self.http_stopped = True
@@ skipping 31 matching lines @@
         self.assertEqual(self.websocket_started, False)
         manager._stop_servers()
         self.assertEqual(self.http_stopped, False)
         self.assertEqual(self.websocket_stopped, False)
 
 
     def test_look_for_new_crash_logs(self):
         def get_manager():
             host = MockHost()
             port = host.port_factory.get('test-mac-leopard')
-            manager = Manager(port, options=MockOptions(test_list=None, http=True, max_locked_shards=1), printer=Mock())
+            manager = Manager(port, options=MockOptions(test_list=None, http=True, max_locked_shards=1), printer=FakePrinter())
             return manager
         host = MockHost()
         port = host.port_factory.get('test-mac-leopard')
         tests = ['failures/expected/crash.html']
         expectations = test_expectations.TestExpectations(port, tests)
         run_results = TestRunResults(expectations, len(tests))
         manager = get_manager()
         manager._look_for_new_crash_logs(run_results, time.time())