It turns out that turning on max-workers (likely) made http tests

considerably *more* flaky on windows. Go back to the default number
of workers (0).

Sigh. It was worth a try.
Review URL: http://codereview.chromium.org/489001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34221 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 8 deletions

diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py
index 36490ce..898bfae 100755
--- a/webkit/tools/layout_tests/layout_package/http_server.py
+++ b/webkit/tools/layout_tests/layout_package/http_server.py
@@ -85,13 +85,12 @@ class Lighttpd(http_server_base.HttpServerBase):
     )
 
 
-  def __init__(self, output_dir, num_workers=None, background=False, port=None,
+  def __init__(self, output_dir, background=False, port=None,
                root=None, register_cygwin=None, run_background=None):
     """Args:
       output_dir: the absolute path to the layout test result directory
     """
     self._output_dir = output_dir
-    self._num_workers = num_workers
     self._process = None
     self._port = port
     self._root = root
@@ -141,10 +140,6 @@ class Lighttpd(http_server_base.HttpServerBase):
     f.write(('server.errorlog = "%s"\n'
              'accesslog.filename = "%s"\n\n') % (error_log, access_log))
 
-    # Setup the number of worker processes to spawn.
-    if self._num_workers:
-      f.write('server.max-worker = %s' % self._num_workers)
-
     # Setup upload folders. Upload folder is to hold temporary upload files
     # and also POST data. This is used to support XHR layout tests that does
     # POST.
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index a030197..1b8948b 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -137,8 +137,7 @@ class TestRunner:
       self._http_server = apache_http_server.LayoutTestApacheHttpd(
           options.results_directory)
     else:
-      self._http_server = http_server.Lighttpd(options.results_directory,
-          num_workers=self._options.num_test_shells)
+      self._http_server = http_server.Lighttpd(options.results_directory)
 
     self._shardable_directories = ['chrome', 'LayoutTests', 'pending', 'fast',
         'svg']