Update manifest for changed test layout; add CONTRIBUTORS file to the RDoc pattern in the Rakefile.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/branches/stable_1-1@975 19e92222-5c0b-0410-8929-a290d50e31e9

3 files changed, 21 insertions, 63 deletions

diff --git a/Manifest b/Manifest
index 6a77dad..2896ec6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,5 +1,6 @@
 bin/mongrel_rails
 CHANGELOG
+CONTRIBUTORS
 COPYING
 examples/builder.rb
 examples/camping/blog.rb
@@ -43,27 +44,29 @@ lib/mongrel/stats.rb
 lib/mongrel/tcphack.rb
 lib/mongrel/uri_classifier.rb
 lib/mongrel.rb
+lib/mongrel.rb.rej
 LICENSE
 Manifest
 mongrel-public_cert.pem
-mongrel.gemspec
 README
 setup.rb
+test/benchmark/previous.rb
+test/benchmark/simple.rb
+test/benchmark/utils.rb
 test/mime.yaml
 test/mongrel.conf
-test/test_cgi_wrapper.rb
-test/test_command.rb
-test/test_conditional.rb
-test/test_configurator.rb
-test/test_debug.rb
-test/test_handlers.rb
-test/test_http11.rb
-test/test_redirect_handler.rb
-test/test_request_progress.rb
-test/test_response.rb
-test/test_stats.rb
-test/test_uriclassifier.rb
-test/test_ws.rb
-test/testhelp.rb
-TODO
-tools/trickletest.rb
+test/test_helper.rb
+test/tools/trickletest.rb
+test/unit/test_cgi_wrapper.rb
+test/unit/test_command.rb
+test/unit/test_conditional.rb
+test/unit/test_configurator.rb
+test/unit/test_debug.rb
+test/unit/test_handlers.rb
+test/unit/test_http11.rb
+test/unit/test_redirect_handler.rb
+test/unit/test_request_progress.rb
+test/unit/test_response.rb
+test/unit/test_stats.rb
+test/unit/test_uriclassifier.rb
+test/unit/test_ws.rb
diff --git a/Rakefile b/Rakefile
index 36f907e..af373a8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ e = Echoe.new("mongrel") do |p|
   p.author ="Zed A. Shaw"
   p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage', 'test_*.log', 'log']
   p.url = "http://mongrel.rubyforge.org"
-  p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
+  p.rdoc_pattern = ['README', 'LICENSE', 'CONTRIBUTORS', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
   p.docs_host = 'mongrel.cloudbur.st:/home/eweaver/www/mongrel/htdocs/web'
   p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
   p.ruby_version = '>=1.8.4'
diff --git a/tools/trickletest.rb b/tools/trickletest.rb
deleted file mode 100644
index e19ed71..0000000
--- a/tools/trickletest.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'socket'
-require 'stringio'
-
-def do_test(st, chunk)
-  s = TCPSocket.new('127.0.0.1',ARGV[0].to_i);
-  req = StringIO.new(st)
-  nout = 0
-  randstop = rand(st.length / 10)
-  STDERR.puts "stopping after: #{randstop}"
-
-  begin
-    while data = req.read(chunk)
-      nout += s.write(data)
-      s.flush
-      sleep 0.1
-      if nout > randstop
-        STDERR.puts "BANG! after #{nout} bytes."
-        break
-      end
-    end
-  rescue Object => e
-    STDERR.puts "ERROR: #{e}"
-  ensure
-    s.close
-  end
-end
-
-content = "-" * (1024 * 240)
-st = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\nContent-Length: #{content.length}\r\n\r\n#{content}"
-
-puts "length: #{content.length}"
-
-threads = []
-ARGV[1].to_i.times do 
-  t = Thread.new do
-    size = 100
-    puts ">>>> #{size} sized chunks"
-    do_test(st, size)
-  end
-
-  t.abort_on_exception = true
-  threads << t
-end
-
-threads.each {|t|  t.join}