PageRenderTime 59ms CodeModel.GetById 31ms RepoModel.GetById 0ms app.codeStats 0ms

/patches/ruby/2.0.0/p481/railsexpress/01-zero-broken-tests.patch

http://github.com/skaes/rvm-patchsets
Patch | 181 lines | 167 code | 14 blank | 0 comment | 0 complexity | e39b70b5fbbe1ededb9165337c5ff167 MD5 | raw file
    

  1. diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb
    2. 

  2. index c105122..a67b397 100644
    3. 

  3. --- a/test/etc/test_etc.rb
    4. 

  4. +++ b/test/etc/test_etc.rb
    5. 

  5. @@ -76,6 +76,7 @@ class TestEtc < Test::Unit::TestCase
    6. 

  6.    end
    7. 

  7.  
    8. 

  8.    def test_getgrgid
    9. 

  9. +    skip "Broken Etc.getgrgid on this machine" if ENV['RUBY_TEST_OPTIONS_BROKEN_GETGRGID']=='1'
    10. 

  10.      # group database is not unique on GID, and which entry will be
    11. 

  11.      # returned by getgrgid() is not specified.
    12. 

  12.      groups = Hash.new {[]}
    13. 

  13. @@ -92,6 +93,7 @@ class TestEtc < Test::Unit::TestCase
    14. 

  14.    end
    15. 

  15.  
    16. 

  16.    def test_getgrnam
    17. 

  17. +    skip "Broken Etc.getgrnam on this machine" if ENV['RUBY_TEST_OPTIONS_BROKEN_GETGRNAM']=='1'
    18. 

  18.      groups = {}
    19. 

  19.      Etc.group do |s|
    20. 

  20.        groups[s.name] ||= s unless /\A\+/ =~ s.name
    21. 

  21. diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
    22. 

  22. index c760e8e..f0ae216 100644
    23. 

  23. --- a/test/ruby/test_process.rb
    24. 

  24. +++ b/test/ruby/test_process.rb
    25. 

  25. @@ -1554,6 +1554,7 @@ class TestProcess < Test::Unit::TestCase
    26. 

  26.  
    27. 

  27.    def test_execopts_gid
    28. 

  28.      skip "Process.groups not implemented on Windows platform" if windows?
    29. 

  29. +    skip "Broken Etc.getgrgid on this machine" if ENV['RUBY_TEST_OPTIONS_BROKEN_GETGRGID']=='1'
    30. 

  30.      feature6975 = '[ruby-core:47414]'
    31. 

  31.  
    32. 

  32.      [30000, *Process.groups.map {|g| g = Etc.getgrgid(g); [g.name, g.gid]}].each do |group, gid|
    33. 

  33. diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
    34. 

  34. index cc27b34..f40d6f7 100644
    35. 

  35. --- a/test/webrick/test_filehandler.rb
    36. 

  36. +++ b/test/webrick/test_filehandler.rb
    37. 

  37. @@ -21,6 +21,10 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
    38. 

  38.      end
    39. 

  39.    end
    40. 

  40.  
    41. 

  41. +  def webrick_config_http
    42. 

  42. +    WEBrick::Config::HTTP.merge(:ServerName => "localhost")
    43. 

  43. +  end
    44. 

  44. +
    45. 

  45.    def make_range_request(range_spec)
    46. 

  46.      msg = <<-END_OF_REQUEST
    47. 

  47.        GET / HTTP/1.0
    48. 

  48. @@ -31,9 +35,9 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
    49. 

  49.    end
    50. 

  50.  
    51. 

  51.    def make_range_response(file, range_spec)
    52. 

  52. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    53. 

  53. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    54. 

  54.      req.parse(make_range_request(range_spec))
    55. 

  55. -    res = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
    56. 

  56. +    res = WEBrick::HTTPResponse.new(webrick_config_http)
    57. 

  57.      size = File.size(file)
    58. 

  58.      handler = default_file_handler(file)
    59. 

  59.      handler.make_partial_content(req, res, file, size)
    60. 

  60. diff --git a/test/webrick/test_httprequest.rb b/test/webrick/test_httprequest.rb
    61. 

  61. index 0ce6b4f..b34cddd 100644
    62. 

  62. --- a/test/webrick/test_httprequest.rb
    63. 

  63. +++ b/test/webrick/test_httprequest.rb
    64. 

  64. @@ -3,11 +3,15 @@ require "stringio"
    65. 

  65.  require "test/unit"
    66. 

  66.  
    67. 

  67.  class TestWEBrickHTTPRequest < Test::Unit::TestCase
    68. 

  68. +  def webrick_config_http
    69. 

  69. +    WEBrick::Config::HTTP.merge(:ServerName => "localhost")
    70. 

  70. +  end
    71. 

  71. +
    72. 

  72.    def test_simple_request
    73. 

  73.      msg = <<-_end_of_message_
    74. 

  74.  GET /
    75. 

  75.      _end_of_message_
    76. 

  76. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    77. 

  77. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    78. 

  78.      req.parse(StringIO.new(msg))
    79. 

  79.      assert(req.meta_vars) # fails if @header was not initialized and iteration is attempted on the nil reference
    80. 

  80.    end
    81. 

  81. @@ -17,12 +21,12 @@ GET /
    82. 

  82.        GET /
    83. 

  83.        foobar    # HTTP/0.9 request don't have header nor entity body.
    84. 

  84.      _end_of_message_
    85. 

  85. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    86. 

  86. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    87. 

  87.      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    88. 

  88.      assert_equal("GET", req.request_method)
    89. 

  89.      assert_equal("/", req.unparsed_uri)
    90. 

  90.      assert_equal(WEBrick::HTTPVersion.new("0.9"), req.http_version)
    91. 

  91. -    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
    92. 

  92. +    assert_equal(webrick_config_http[:ServerName], req.host)
    93. 

  93.      assert_equal(80, req.port)
    94. 

  94.      assert_equal(false, req.keep_alive?)
    95. 

  95.      assert_equal(nil, req.body)
    96. 

  96. @@ -34,12 +38,12 @@ GET /
    97. 

  97.        GET / HTTP/1.0
    98. 

  98.  
    99. 

  99.      _end_of_message_
    100. 

  100. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    101. 

  101. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    102. 

  102.      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    103. 

  103.      assert_equal("GET", req.request_method)
    104. 

  104.      assert_equal("/", req.unparsed_uri)
    105. 

  105.      assert_equal(WEBrick::HTTPVersion.new("1.0"), req.http_version)
    106. 

  106. -    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
    107. 

  107. +    assert_equal(webrick_config_http[:ServerName], req.host)
    108. 

  108.      assert_equal(80, req.port)
    109. 

  109.      assert_equal(false, req.keep_alive?)
    110. 

  110.      assert_equal(nil, req.body)
    111. 

  111. @@ -51,14 +55,14 @@ GET /
    112. 

  112.        GET /path HTTP/1.1
    113. 

  113.  
    114. 

  114.      _end_of_message_
    115. 

  115. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    116. 

  116. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    117. 

  117.      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    118. 

  118.      assert_equal("GET", req.request_method)
    119. 

  119.      assert_equal("/path", req.unparsed_uri)
    120. 

  120.      assert_equal("", req.script_name)
    121. 

  121.      assert_equal("/path", req.path_info)
    122. 

  122.      assert_equal(WEBrick::HTTPVersion.new("1.1"), req.http_version)
    123. 

  123. -    assert_equal(WEBrick::Config::HTTP[:ServerName], req.host)
    124. 

  124. +    assert_equal(webrick_config_http[:ServerName], req.host)
    125. 

  125.      assert_equal(80, req.port)
    126. 

  126.      assert_equal(true, req.keep_alive?)
    127. 

  127.      assert_equal(nil, req.body)
    128. 

  128. @@ -69,7 +73,7 @@ GET /
    129. 

  129.      msg = <<-_end_of_message_
    130. 

  130.        GET /#{"a"*2084} HTTP/1.1
    131. 

  131.      _end_of_message_
    132. 

  132. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    133. 

  133. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    134. 

  134.      assert_raise(WEBrick::HTTPStatus::RequestURITooLarge){
    135. 

  135.        req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    136. 

  136.      }
    137. 

  137. @@ -122,7 +126,7 @@ GET /
    138. 

  138.  
    139. 

  139.        hogehoge
    140. 

  140.      _end_of_message_
    141. 

  141. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    142. 

  142. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    143. 

  143.      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    144. 

  144.      assert_equal("POST", req.request_method)
    145. 

  145.      assert_equal("/foo/baz", req.path)
    146. 

  146. @@ -139,7 +143,7 @@ GET /
    147. 

  147.        Host: test.ruby-lang.org
    148. 

  148.  
    149. 

  149.      _end_of_message_
    150. 

  150. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    151. 

  151. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    152. 

  152.      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    153. 

  153.      assert_equal(URI.parse("http://test.ruby-lang.org/path"), req.request_uri)
    154. 

  154.      assert_equal("test.ruby-lang.org", req.host)
    155. 

  155. @@ -150,7 +154,7 @@ GET /
    156. 

  156.        Host: 192.168.1.1
    157. 

  157.  
    158. 

  158.      _end_of_message_
    159. 

  159. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    160. 

  160. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    161. 

  161.      req.parse(StringIO.new(msg.gsub(/^ {6}/, "")))
    162. 

  162.      assert_equal(URI.parse("http://192.168.1.1/path"), req.request_uri)
    163. 

  163.      assert_equal("192.168.1.1", req.host)
    164. 

  164. @@ -343,7 +347,7 @@ GET /
    165. 

  165.  
    166. 

  166.      _end_of_message_
    167. 

  167.      msg.gsub!(/^ {6}/, "")
    168. 

  168. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    169. 

  169. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    170. 

  170.      req.parse(StringIO.new(msg))
    171. 

  171.      assert req['expect']
    172. 

  172.      l = msg.size
    173. 

  173. @@ -359,7 +363,7 @@ GET /
    174. 

  174.  
    175. 

  175.      _end_of_message_
    176. 

  176.      msg.gsub!(/^ {6}/, "")
    177. 

  177. -    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
    178. 

  178. +    req = WEBrick::HTTPRequest.new(webrick_config_http)
    179. 

  179.      req.parse(StringIO.new(msg))
    180. 

  180.      assert !req['expect']
    181. 

  181.      l = msg.size
    182. 

  182.