← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to test/net/http/utils.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/net/http/utils.rb
48
48
      :ShutdownSocketWithoutClose => true,
49
49
      :ServerType => Thread,
50
50
    }
 
51
    server_config[:OutputBufferSize] = 4 if config('chunked')
51
52
    if defined?(OpenSSL) and config('ssl_enable')
52
53
      server_config.update({
53
54
        :SSLEnable      => true,
56
57
      })
57
58
    end
58
59
    @server = WEBrick::HTTPServer.new(server_config)
59
 
    @server.mount('/', Servlet)
 
60
    @server.mount('/', Servlet, config('chunked'))
60
61
    @server.start
61
62
    n_try_max = 5
62
63
    begin
75
76
  $test_net_http_data_type = 'application/octet-stream'
76
77
 
77
78
  class Servlet < WEBrick::HTTPServlet::AbstractServlet
 
79
    def initialize(this, chunked = false)
 
80
      @chunked = chunked
 
81
    end
 
82
 
78
83
    def do_GET(req, res)
79
84
      res['Content-Type'] = $test_net_http_data_type
80
85
      res.body = $test_net_http_data
 
86
      res.chunked = @chunked
81
87
    end
82
88
 
83
89
    # echo server
84
90
    def do_POST(req, res)
85
91
      res['Content-Type'] = req['Content-Type']
86
92
      res.body = req.body
 
93
      res.chunked = @chunked
87
94
    end
88
95
  end
89
96