Update to ruby/spec@cd1b911

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 4 deletions

diff --git a/spec/rubyspec/library/net/ftp/fixtures/server.rb b/spec/rubyspec/library/net/ftp/fixtures/server.rb
index 69dc151333..2129835883 100644
--- a/spec/rubyspec/library/net/ftp/fixtures/server.rb
+++ b/spec/rubyspec/library/net/ftp/fixtures/server.rb
@@ -8,9 +8,9 @@ module NetFTPSpecs
     # port number
     attr_reader :server_port
 
-    def initialize(hostname = "localhost", server_port = 0)
-      @hostname = hostname
-      @server = TCPServer.new(@hostname, server_port)
+    def initialize
+      @hostname = "localhost"
+      @server = TCPServer.new(@hostname, 0)
       @server_port = @server.addr[1]
 
       @handlers = {}
diff --git a/spec/rubyspec/library/net/http/http/fixtures/http_server.rb b/spec/rubyspec/library/net/http/http/fixtures/http_server.rb
index 9c6fe2696f..c2ae2360d3 100644
--- a/spec/rubyspec/library/net/http/http/fixtures/http_server.rb
+++ b/spec/rubyspec/library/net/http/http/fixtures/http_server.rb
@@ -47,7 +47,8 @@ module NetHTTPSpecs
     @server_thread = nil
 
     def port
-      @server ? @server.config[:Port] : 3333
+      raise "server not started" unless @server
+      @server.config[:Port]
     end
 
     def start_server
@@ -79,9 +80,11 @@ module NetHTTPSpecs
         rescue Errno::EPIPE
           # Because WEBrick is not thread-safe and only catches IOError
         end
+        @server = nil
       end
       if @server_thread
         @server_thread.join
+        @server_thread = nil
       end
       timeout = WEBrick::Utils::TimeoutHandler
       timeout.terminate if timeout.respond_to?(:terminate)