Clean up run-blink-httpd, run-blink-websocketserver, add tests.

Tools/Scripts/webkitpy/layout_tests/servers/cli_wrapper_unittest.py

Index: Tools/Scripts/webkitpy/layout_tests/servers/cli_wrapper_unittest.py
diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/cli_wrapper_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/cli_wrapper_unittest.py
new file mode 100644
index 0000000000000000000000000000000000000000..54647394d6b0689526e37f560fd62d3b5080668e
--- /dev/null
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/cli_wrapper_unittest.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import unittest
+
+from webkitpy.layout_tests.servers import server_base
+from webkitpy.layout_tests.servers import cli_wrapper
+
+
+class MockServer(object):
+    def __init__(self, *args, **kwargs):
+        self.args = args
+        self.kwargs = kwargs
+        self.start_called = False
+        self.stop_called = False
+
+    def start(self):
+        self.start_called = True
+
+    def stop(self):
+        self.stop_called = True
+
+
+class TestCliWrapper(unittest.TestCase):
+
+    def test_main(self):
+        def mock_server_constructor(*args, **kwargs):
+            self.server = MockServer(args, kwargs)
+            return self.server
+
+        cli_wrapper.main(mock_server_constructor, input_fn=lambda msg: True, argv=[])
+        self.assertTrue(self.server.start_called)
+        self.assertTrue(self.server.stop_called)