Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Tools / Scripts / webkitpy / layout_tests / servers / pywebsocket.py

diff --git a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
index 966ed71..ef51fb2 100644 (file)
--- a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
+++ b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py
@@ -46,7 +46,7 @@ _DEFAULT_WS_PORT = 8880
 
 class PyWebSocket(server_base.ServerBase):
 
-    def __init__(self, port_obj, output_dir, additional_dirs=None):
+    def __init__(self, port_obj, output_dir):
         super(PyWebSocket, self).__init__(port_obj, output_dir)
         self._name = 'pywebsocket'
         self._log_prefixes = (_WS_LOG_PREFIX,)
@@ -58,7 +58,7 @@ class PyWebSocket(server_base.ServerBase):
         self._web_socket_tests = self._filesystem.join(self._layout_tests, 'http', 'tests', 'websocket')
         time_str = time.strftime('%d%b%Y-%H%M%S')
         log_file_name = _WS_LOG_PREFIX + time_str
-        error_log = self._filesystem.join(self._output_dir, log_file_name + "-err.txt")
+        self._error_log = self._filesystem.join(self._output_dir, log_file_name + "-err.txt")
         pywebsocket_base = self._port_obj.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdparty')
         pywebsocket_script = self._filesystem.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py')
 
@@ -69,7 +69,7 @@ class PyWebSocket(server_base.ServerBase):
             '--document-root', self._web_socket_tests,
             '--scan-dir', self._web_socket_tests,
             '--cgi-paths', '/',
-            '--log-file', error_log,
+            '--log-file', self._error_log,
             '--websock-handlers-map-file', self._filesystem.join(self._web_socket_tests, 'handler_map.txt'),
             ]
         self._env = self._port_obj.setup_environ_for_server()