remove timeout from nginx_run_server call when it is equals to default value

misc/spec/mix/broadcast_properties_spec.rb

@@ -16,7 +16,7 @@ describe "Broadcast Properties" do
 
     body = 'broadcast channel prefix'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s ).post :head => headers, :body => body
         pub.callback do
@@ -42,7 +42,7 @@ describe "Broadcast Properties" do
     channel_broad3 = 'XXX_213'
     body = 'broadcast channel prefix'
 
-    nginx_run_server(config.merge(:broadcast_channel_max_qtd => 2), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:broadcast_channel_max_qtd => 2)) do |conf|
       EventMachine.run do
         pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s ).post :head => headers, :body => body
         pub.callback do

misc/spec/mix/channel_statistics_spec.rb

@@ -8,7 +8,7 @@ describe "Channel Statistics" do
   it "should return 404 for a nonexistent channel" do
     channel = 'ch_test_get_channel_statistics_whithout_created_channel'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         pub_1 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats?id=' + channel.to_s).get :head => headers
         pub_1.callback do
@@ -24,7 +24,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_get_channel_statistics_to_existing_channel'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -48,7 +48,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_get_channel_statistics_to_existing_channel_with_subscriber'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       create_channel_by_subscribe(channel, headers) do
         pub_1 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats?id=' + channel.to_s).get :head => headers
         pub_1.callback do
@@ -66,7 +66,7 @@ describe "Channel Statistics" do
   end
 
   it "should return detailed channels statistics without existing channels" do
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         pub_2 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats?id=ALL').get :head => headers
         pub_2.callback do
@@ -84,7 +84,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_get_detailed_channels_statistics_to_existing_channel'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -109,7 +109,7 @@ describe "Channel Statistics" do
     channel = 'bd_test_get_detailed_channels_statistics_to_existing_broadcast_channel'
     body = 'body'
 
-    nginx_run_server(config.merge(:broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1)) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -136,7 +136,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_detailed_channels_statistics_to_existing_channel_with_subscriber'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       create_channel_by_subscribe(channel, headers) do
         pub_1 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats?id=ALL').get :head => headers
         pub_1.callback do
@@ -155,7 +155,7 @@ describe "Channel Statistics" do
   end
 
   it "should return summarized channels statistics for a nonexistent channel" do
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         pub_1 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats').get :head => headers
         pub_1.callback do
@@ -174,7 +174,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_get_summarized_channels_statistics_to_existing_channel'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -198,7 +198,7 @@ describe "Channel Statistics" do
     channel = 'bd_test_get_summarized_channels_statistics_to_existing_broadcast_channel'
     body = 'body'
 
-    nginx_run_server(config.merge(:broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1)) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -223,7 +223,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_summarized_channels_statistics_to_existing_channel_with_subscriber'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       create_channel_by_subscribe(channel, headers) do
         pub_1 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats').get :head => headers
         pub_1.callback do
@@ -241,7 +241,7 @@ describe "Channel Statistics" do
   end
 
   it "should check accepted methods" do
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         multi = EventMachine::MultiRequest.new
 
@@ -279,7 +279,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_accepted_content_types'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -361,7 +361,7 @@ describe "Channel Statistics" do
   end
 
   it "should return detailed channels statistics for a nonexistent channel using prefix id" do
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         pub_2 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats?id=prefix_*').get :head => headers
         pub_2.callback do
@@ -380,7 +380,7 @@ describe "Channel Statistics" do
     channel_1 = 'another_ch_test_get_detailed_channels_statistics_to_existing_channel_using_prefix'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channels
       publish_message(channel, headers, body)
       publish_message(channel_1, headers, body)
@@ -407,7 +407,7 @@ describe "Channel Statistics" do
     channel_1 = 'another_ch_test_get_detailed_channels_statistics_using_prefix_as_same_behavior_ALL'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channels
       publish_message(channel, headers, body)
       publish_message(channel_1, headers, body)
@@ -437,7 +437,7 @@ describe "Channel Statistics" do
     channel = 'bd_test_get_detailed_channels_statistics_to_existing_broadcast_channel_using_prefix'
     body = 'body'
 
-    nginx_run_server(config.merge(:broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1)) do |conf|
       #create channels
       publish_message(channel, headers, body)
 
@@ -464,7 +464,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_detailed_channels_statistics_to_existing_channel_with_subscriber_using_prefix'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       create_channel_by_subscribe(channel, headers) do
         pub_1 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats?id=ch_test_*').get :head => headers
         pub_1.callback do
@@ -515,7 +515,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_get_uptime_in_detailed_channels_statistics'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channel
       publish_message(channel, headers, body)
 
@@ -550,7 +550,7 @@ describe "Channel Statistics" do
     channel = 'ch_test_get_uptime_in_summarized_channels_statistics'
     body = 'body'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       #create channel
       publish_message(channel, headers, body)
 

misc/spec/mix/keepalive_spec.rb

@@ -32,7 +32,7 @@ describe "Keepalive" do
     channel = 'ch_test_different_operation_with_keepalive'
     content = 'message to be sent'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
 
       headers, body = get_in_socket("/pub", socket)

misc/spec/mix/measure_memory_spec.rb

@@ -24,7 +24,7 @@ describe "Measure Memory" do
     channel = 'ch_test_message_size'
     body = '1'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       shared_size = conf.shared_memory_size.to_i * 1024 * 1024
 
       post_channel_message = "POST /pub?id=#{channel} HTTP/1.0\r\nContent-Length: #{body.size}\r\n\r\n#{body}"
@@ -86,7 +86,7 @@ describe "Measure Memory" do
   end
 
   it "should check subscriber size" do
-    nginx_run_server(config.merge({:shared_memory_size => "300k", :header_template => "H"}), :timeout => 5) do |conf|
+    nginx_run_server(config.merge({:shared_memory_size => "300k", :header_template => "H"})) do |conf|
       shared_size = conf.shared_memory_size.to_i * 1024 #shm size is in kbytes for this test
 
       EventMachine.run do

misc/spec/publisher/properties_spec.rb

@@ -4,7 +4,7 @@ describe "Publisher Properties" do
 
   shared_examples_for "publisher location" do
     it "should not accept access without a channel id" do
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=').get :head => headers
           pub.callback do
@@ -22,7 +22,7 @@ describe "Publisher Properties" do
       channel_2 = 'ch_test_access_whith_channel_id_to_absent_channel_2'
       body = 'body'
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel_1.to_s).get :head => headers
           pub_1.callback do
@@ -49,7 +49,7 @@ describe "Publisher Properties" do
       channel = 'ch_test_access_whith_channel_id_to_existing_channel'
       body = 'body'
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         #create channel
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s).post :head => headers, :body => body
@@ -76,7 +76,7 @@ describe "Publisher Properties" do
     end
 
     it "should check accepted methods" do
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           multi = EventMachine::MultiRequest.new
 
@@ -121,7 +121,7 @@ describe "Publisher Properties" do
       channel = 'ALL'
       body = 'body'
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s).post :head => headers, :body => body
           pub_1.callback do
@@ -140,7 +140,7 @@ describe "Publisher Properties" do
       channel_3 = 'abcdefgh*'
       body = 'body'
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           multi = EventMachine::MultiRequest.new
 
@@ -169,7 +169,7 @@ describe "Publisher Properties" do
       end
       body += '$'
 
-      nginx_run_server(config.merge(:client_max_body_size => '2k', :client_body_buffer_size => '1k'), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:client_max_body_size => '2k', :client_body_buffer_size => '1k')) do |conf|
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s).post :head => headers, :body => body
           pub_1.callback do
@@ -188,7 +188,7 @@ describe "Publisher Properties" do
       end
       body += '$'
 
-      nginx_run_server(config.merge(:client_max_body_size => '10k', :client_body_buffer_size => '1k'), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:client_max_body_size => '10k', :client_body_buffer_size => '1k')) do |conf|
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s).post :head => headers, :body => body
           pub_1.callback do
@@ -208,7 +208,7 @@ describe "Publisher Properties" do
       end
       body += '$'
 
-      nginx_run_server(config.merge(:client_max_body_size => '10k', :client_body_buffer_size => '6k'), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:client_max_body_size => '10k', :client_body_buffer_size => '6k')) do |conf|
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s).post :head => headers, :body => body
           pub_1.callback do
@@ -224,7 +224,7 @@ describe "Publisher Properties" do
       body = 'published message'
       channel = 'ch_test_stored_messages'
 
-      nginx_run_server(config.merge(:store_messages => "on"), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:store_messages => "on")) do |conf|
         EventMachine.run do
           pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s ).post :head => headers, :body => body
           pub_1.callback do
@@ -246,7 +246,7 @@ describe "Publisher Properties" do
       body = 'published message'
       channel = 'ch_test_not_stored_messages'
 
-      nginx_run_server(config.merge(:store_messages => "off"), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:store_messages => "off")) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s ).post :head => headers, :body => body
           pub.callback do
@@ -263,7 +263,7 @@ describe "Publisher Properties" do
       channel = 'ch_test_max_stored_messages'
       messagens_to_publish = 10
 
-      nginx_run_server(config.merge(:store_messages => "on", :max_messages_stored_per_channel => 4), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:store_messages => "on", :max_messages_stored_per_channel => 4)) do |conf|
         EventMachine.run do
           i = 0
           stored_messages = 0
@@ -288,7 +288,7 @@ describe "Publisher Properties" do
       body = 'published message'
       channel = '123456'
 
-      nginx_run_server(config.merge(:max_channel_id_length => 5), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:max_channel_id_length => 5)) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s ).post :head => headers, :body => body
           pub.callback do
@@ -305,7 +305,7 @@ describe "Publisher Properties" do
       body = 'published message'
       channel = 'ch_test_max_number_of_channels_'
 
-      nginx_run_server(config.merge(:max_number_of_channels => 1), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:max_number_of_channels => 1)) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s + 1.to_s).post :head => headers, :body => body
           pub.callback do
@@ -331,7 +331,7 @@ describe "Publisher Properties" do
       body = 'published message'
       channel = 'bd_test_max_number_of_broadcast_channels_'
 
-      nginx_run_server(config.merge(:max_number_of_broadcast_channels => 1, :broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:max_number_of_broadcast_channels => 1, :broadcast_channel_prefix => 'bd_', :broadcast_channel_max_qtd => 1)) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s + 1.to_s).post :head => headers, :body => body
           pub.callback do
@@ -356,7 +356,7 @@ describe "Publisher Properties" do
     it "should set a default access control allow orgin header" do
       channel = 'test_default_access_control_allow_origin_header'
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel).get :head => headers
           pub.callback do
@@ -370,7 +370,7 @@ describe "Publisher Properties" do
     it "should set a custom access control allow orgin header" do
       channel = 'test_custom_access_control_allow_origin_header'
 
-      nginx_run_server(config.merge(:allowed_origins => "custom.domain.com"), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:allowed_origins => "custom.domain.com")) do |conf|
         EventMachine.run do
           pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel).get :head => headers
           pub.callback do
@@ -415,7 +415,7 @@ describe "Publisher Properties" do
       channel = 'test_delete_channel_whithout_subscribers'
       body = 'published message'
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         publish_message(channel, headers, body)
 
         EventMachine.run do
@@ -451,7 +451,7 @@ describe "Publisher Properties" do
       })
 
       resp = ""
-      nginx_run_server(configuration, :timeout => 5) do |conf|
+      nginx_run_server(configuration) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.stream do |chunk|
@@ -507,7 +507,7 @@ describe "Publisher Properties" do
       })
 
       resp = ""
-      nginx_run_server(configuration, :timeout => 5) do |conf|
+      nginx_run_server(configuration) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel_1.to_s + '/' + channel_2.to_s).get :head => headers
           sub_1.stream do |chunk|
@@ -668,7 +668,7 @@ describe "Publisher Properties" do
       })
 
       resp = ""
-      nginx_run_server(configuration, :timeout => 5) do |conf|
+      nginx_run_server(configuration) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.stream do |chunk|
@@ -716,7 +716,7 @@ describe "Publisher Properties" do
 
       resp = ""
       resp2 = ""
-      nginx_run_server(configuration, :timeout => 5) do |conf|
+      nginx_run_server(configuration) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.stream do |chunk|
@@ -759,7 +759,7 @@ describe "Publisher Properties" do
       })
 
       resp = ""
-      nginx_run_server(configuration, :timeout => 5) do |conf|
+      nginx_run_server(configuration) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.stream do |chunk|

misc/spec/publisher/publish_messages_spec.rb

@@ -14,7 +14,7 @@ describe "Publisher Publishing Messages" do
     body = 'published unique message'
     channel = 'ch_test_publish_messages'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
         sub.stream do |chunk|
@@ -30,7 +30,7 @@ describe "Publisher Publishing Messages" do
   it "should accept messages with different bytes" do
     channel = 'ch_test_publish_messages_with_different_bytes'
 
-    nginx_run_server(config.merge(:client_max_body_size => '130k', :client_body_buffer_size => '130k', :subscriber_connection_ttl => "1s"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:client_max_body_size => '130k', :client_body_buffer_size => '130k', :subscriber_connection_ttl => "1s")) do |conf|
       ranges = [1..255]
       ranges.each do |range|
         bytes = []
@@ -100,7 +100,7 @@ describe "Publisher Publishing Messages" do
     messagens_to_publish = 1500
 
     response = ""
-    nginx_run_server(config.merge(:max_reserved_memory => "256m", :keepalive => "on"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:max_reserved_memory => "256m", :keepalive => "on")) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
         sub.stream do |chunk|
@@ -133,7 +133,7 @@ describe "Publisher Publishing Messages" do
     channel = 'ch_test_set_an_event_id_to_the_message_through_header_parameter'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"event_id\": \"~event-id~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"event_id\": \"~event-id~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -156,7 +156,7 @@ describe "Publisher Publishing Messages" do
     channel = 'ch_test_set_an_event_type_to_the_message_through_header_parameter'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"event_type\": \"~event-type~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"event_type\": \"~event-type~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -179,7 +179,7 @@ describe "Publisher Publishing Messages" do
     channel = 'ch_test_set_an_event_id_to_the_message_through_header_parameter'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"event_id\": \"~event-id~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"event_id\": \"~event-id~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -216,7 +216,7 @@ describe "Publisher Publishing Messages" do
     response = ''
     now = nil
 
-    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"publish_time\": \"~time~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"publish_time\": \"~time~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -242,7 +242,7 @@ describe "Publisher Publishing Messages" do
     channel = 'ch_test_expose_message_tag_through_message_template'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"tag\": \"~tag~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\": \"~id~\", \"channel\": \"~channel~\", \"text\": \"~text~\", \"tag\": \"~tag~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|

misc/spec/subscriber/comunication_properties_spec.rb

@@ -14,7 +14,7 @@ describe "Comunication Properties" do
   it "should not block to connected to a nonexistent channel" do
     channel = 'ch_test_all_authorized'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
         sub.stream do |chunk|
@@ -29,7 +29,7 @@ describe "Comunication Properties" do
     channel = 'ch_test_only_authorized'
     body = 'message to create a channel'
 
-    nginx_run_server(config.merge(:authorized_channels_only => "on"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:authorized_channels_only => "on")) do |conf|
       EventMachine.run do
         sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
         sub_1.callback do |chunk|
@@ -99,7 +99,7 @@ describe "Comunication Properties" do
     body = 'message to create a channel'
 
     response = ""
-    nginx_run_server(config.merge(:message_template => '{\"duplicated\":\"~channel~\", \"channel\":\"~channel~\", \"message\":\"~text~\", \"message_id\":\"~id~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"duplicated\":\"~channel~\", \"channel\":\"~channel~\", \"message\":\"~text~\", \"message_id\":\"~id~\"}')) do |conf|
       publish_message(channel, headers, body)
 
       EventMachine.run do
@@ -125,7 +125,7 @@ describe "Comunication Properties" do
     body = '~channel~~channel~~channel~~text~~text~~text~'
 
     response = ""
-    nginx_run_server(config.merge(:message_template => '{\"channel\":\"~channel~\", \"message\":\"~text~\", \"message_id\":\"~id~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"channel\":\"~channel~\", \"message\":\"~text~\", \"message_id\":\"~id~\"}')) do |conf|
       publish_message(channel, headers, body)
 
       EventMachine.run do

misc/spec/subscriber/event_source_spec.rb

@@ -14,7 +14,7 @@ describe "Subscriber Event Source" do
   it "should use content type as 'event stream'" do
     channel = 'ch_test_content_type_should_be_event_stream'
 
-    nginx_run_server(config.merge(:header_template => "header"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:header_template => "header")) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -28,7 +28,7 @@ describe "Subscriber Event Source" do
   it "should split header lines and prefix them by a colon" do
     channel = 'ch_test_each_line_on_header_template_should_be_prefixed_by_a_colon'
 
-    nginx_run_server(config.merge(:header_template => "header line 1\nheader line 2\rheader line 3\r\nheader line 4"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:header_template => "header line 1\nheader line 2\rheader line 3\r\nheader line 4")) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -42,7 +42,7 @@ describe "Subscriber Event Source" do
   it "should treat escaped new lines on header as single lines" do
     channel = 'ch_test_escaped_new_lines_on_header_template_should_be_treated_as_single_line'
 
-    nginx_run_server(config.merge(:header_template => "header line 1\\\\nheader line 2"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:header_template => "header line 1\\\\nheader line 2")) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -57,7 +57,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_each_line_on_footer_template_should_be_prefixed_by_a_colon'
     response = ''
 
-    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s', :footer_template => "footer line 1\nfooter line 2\rfooter line 3\r\nfooter line 4"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s', :footer_template => "footer line 1\nfooter line 2\rfooter line 3\r\nfooter line 4")) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -75,7 +75,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_escaped_new_lines_on_footer_template_should_be_treated_as_single_line'
     response = ''
 
-    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s', :footer_template => "footer line 1\\\\nfooter line 2"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s', :footer_template => "footer line 1\\\\nfooter line 2")) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -94,7 +94,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_default_message_template_without_event_id'
     response = ''
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -115,7 +115,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_default_message_template_without_event_type'
     response = ''
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -137,7 +137,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_default_message_template_with_event_id'
     response = ''
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -159,7 +159,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_default_message_template_with_event_type'
     response = ''
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -180,7 +180,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_custom_message_template_without_event_id'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -201,7 +201,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_custom_message_template_without_event_type'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -223,7 +223,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_custom_message_template_with_event_id'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -245,7 +245,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_custom_message_template_with_event_type'
     response = ''
 
-    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -265,7 +265,7 @@ describe "Subscriber Event Source" do
     body = "line 1\nline 2\rline 3\r\nline 4"
     channel = 'ch_test_each_line_on_posted_message_should_be_applied_to_template'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -284,7 +284,7 @@ describe "Subscriber Event Source" do
     body = "line 1\\nline 2"
     channel = 'ch_test_escaped_new_lines_on_posted_message_should_be_treated_as_single_line'
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -302,7 +302,7 @@ describe "Subscriber Event Source" do
   it "should receive ping message" do
     channel = 'ch_test_ping_message_on_event_source'
 
-    nginx_run_server(config.merge(:ping_message_interval => '1s', :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:ping_message_interval => '1s', :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}')) do |conf|
       EventMachine.run do
         sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get
         sub.stream do |chunk|
@@ -319,7 +319,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_get_old_messages_by_last_event_id'
     response = ''
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         publish_message_inline(channel, headers.merge({'Event-Id' => 'event 1'}), 'msg 1')
         publish_message_inline(channel, headers.merge({'Event-Id' => 'event 2'}), 'msg 2')
@@ -342,7 +342,7 @@ describe "Subscriber Event Source" do
     channel = 'ch_test_get_old_messages_by_last_event_id_without_found_event'
     response = ''
 
-    nginx_run_server(config.merge(:ping_message_interval => '1s'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:ping_message_interval => '1s')) do |conf|
       EventMachine.run do
         publish_message_inline(channel, headers.merge({'Event-Id' => 'event 1'}), 'msg 1')
         publish_message_inline(channel, headers.merge({'Event-Id' => 'event 2'}), 'msg 2')

misc/spec/subscriber/long_polling_spec.rb

@@ -9,7 +9,7 @@ describe "Subscriber Properties" do
       body = 'body'
       response = ""
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.stream do |chunk|
@@ -41,7 +41,7 @@ describe "Subscriber Properties" do
       channel = 'ch_test_disconnect_after_receive_old_messages_by_backtrack_when_longpolling_is_on'
       response = ""
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           publish_message_inline(channel, {}, 'msg 1')
           publish_message_inline(channel, {}, 'msg 2')
@@ -76,7 +76,7 @@ describe "Subscriber Properties" do
       channel = 'ch_test_disconnect_after_receive_old_messages_by_last_event_id_when_longpolling_is_on'
       response = ""
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           publish_message_inline(channel, {'Event-Id' => 'event 1'}, 'msg 1')
           publish_message_inline(channel, {'Event-Id' => 'event 2'}, 'msg 2')
@@ -101,7 +101,7 @@ describe "Subscriber Properties" do
       body = 'body'
       response = ""
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           publish_message_inline(channel_1, {}, body + "_1")
           publish_message_inline(channel_2, {}, body + "_2")
@@ -187,7 +187,7 @@ describe "Subscriber Properties" do
       channel = 'ch_test_disconnect_long_polling_subscriber_when_only_longpolling_timeout_is_set'
 
       start = Time.now
-      nginx_run_server(config.merge(:subscriber_connection_ttl => nil, :longpolling_connection_ttl => "3s"), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:subscriber_connection_ttl => nil, :longpolling_connection_ttl => "3s")) do |conf|
         EventMachine.run do
           sub = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub.callback do
@@ -226,7 +226,7 @@ describe "Subscriber Properties" do
       body_prefix = 'published message '
       messagens_to_publish = 10
 
-      nginx_run_server(config.merge(:store_messages => "on", :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}'), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:store_messages => "on", :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\"}')) do |conf|
         EventMachine.run do
           i = 0
           stored_messages = 0
@@ -269,7 +269,7 @@ describe "Subscriber Properties" do
       channel_2 = 'ch_test_receiving_messages_when_connected_in_more_then_one_channel_2'
       body = 'published message'
 
-      nginx_run_server(config.merge(:store_messages => "on", :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\", \"channel\":\"~channel~\"}'), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:store_messages => "on", :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\", \"channel\":\"~channel~\"}')) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel_1.to_s + '/' + channel_2.to_s).get :head => headers.merge({'If-Modified-Since' => 'Thu, 1 Jan 1970 00:00:00 GMT', 'If-None-Match' => 0})
           sub_1.callback do
@@ -299,7 +299,7 @@ describe "Subscriber Properties" do
       body = 'published message'
 
       resp = ""
-      nginx_run_server(config.merge(:publisher_mode => 'admin', :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\", \"channel\":\"~channel~\"}'), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:publisher_mode => 'admin', :message_template => '{\"id\":\"~id~\", \"message\":\"~text~\", \"channel\":\"~channel~\"}')) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.callback do
@@ -325,7 +325,7 @@ describe "Subscriber Properties" do
       body = 'body'
 
       response = ""
-      nginx_run_server(config.merge(:last_received_message_time => "$arg_time", :last_received_message_tag => "$arg_tag"), :timeout => 5) do |conf|
+      nginx_run_server(config.merge(:last_received_message_time => "$arg_time", :last_received_message_tag => "$arg_tag")) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
           sub_1.stream do |chunk|
@@ -361,7 +361,7 @@ describe "Subscriber Properties" do
       response = ""
       callback_function_name = "callback_function"
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s + '?callback=' + callback_function_name).get :head => headers
           sub_1.callback do
@@ -380,7 +380,7 @@ describe "Subscriber Properties" do
       response = ""
       callback_function_name = "callback_function"
 
-      nginx_run_server(config, :timeout => 5) do |conf|
+      nginx_run_server(config) do |conf|
         EventMachine.run do
           publish_message_inline(channel, {}, body)
           publish_message_inline(channel, {}, body + "1")
@@ -400,7 +400,7 @@ describe "Subscriber Properties" do
       response = ""
       callback_function_name = "callback_function"
 
-      nginx_run_server(config.merge({:content_type => "anything/value"}), :timeout => 5) do |conf|
+      nginx_run_server(config.merge({:content_type => "anything/value"})) do |conf|
         EventMachine.run do
           sent_headers = headers.merge({'accept' => 'otherknown/value'})
           sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s + '?callback=' + callback_function_name).get :head => sent_headers

misc/spec/subscriber/padding_by_user_agent_spec.rb

@@ -15,7 +15,7 @@ describe "Subscriber Padding by user agent" do
   it "should apply a padding to the header" do
     channel = 'ch_test_header_padding'
 
-    nginx_run_server(config.merge(:header_template => "0123456789"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:header_template => "0123456789")) do |conf|
       EventMachine.run do
         sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers.merge("User-Agent" => "Test 1")
         sub_1.callback do
@@ -45,7 +45,7 @@ describe "Subscriber Padding by user agent" do
 
     body = "0123456789"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers.merge("User-Agent" => "Test 1")
         sub_1.callback {

misc/spec/subscriber/polling_spec.rb

@@ -9,7 +9,7 @@ describe "Subscriber Properties" do
       it "should receive a 304" do
         channel = 'ch_test_receive_a_304_when_has_no_messages'
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
             sub_1.callback do
@@ -27,7 +27,7 @@ describe "Subscriber Properties" do
         channel = 'ch_test_receive_a_304_when_has_no_messages_keeping_headers'
 
         sent_headers = headers.merge({'If-Modified-Since' => Time.now.utc.strftime("%a, %d %b %Y %T %Z"), 'If-None-Match' => '3'})
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => sent_headers
             sub_1.callback do
@@ -49,7 +49,7 @@ describe "Subscriber Properties" do
         channel = 'ch_test_receive_specific_headers_when_has_messages'
         body = 'body'
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
 
@@ -69,7 +69,7 @@ describe "Subscriber Properties" do
         channel = 'ch_test_getting_messages_by_if_modified_since_header'
         body = 'body'
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
             sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s).get :head => headers
@@ -110,7 +110,7 @@ describe "Subscriber Properties" do
         channel = 'ch_test_getting_messages_by_backtrack'
         body = 'body'
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
             publish_message_inline(channel, {}, body + "1")
@@ -154,7 +154,7 @@ describe "Subscriber Properties" do
         channel = 'ch_test_getting_messages_by_last_event_id_header'
         body = 'body'
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {'Event-Id' => 'event 1'}, 'msg 1')
             publish_message_inline(channel, {'Event-Id' => 'event 2'}, 'msg 2')
@@ -201,7 +201,7 @@ describe "Subscriber Properties" do
         channel_2 = 'ch_test_receive_old_messages_from_different_channels_2'
         body = 'body'
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel_1, {}, body + "_1")
             publish_message_inline(channel_2, {}, body + "_2")
@@ -265,7 +265,7 @@ describe "Subscriber Properties" do
         channel = 'ch_test_send_modified_since_and_none_match_values_not_using_headers_when_polling'
         body = 'body'
 
-        nginx_run_server(config.merge(:last_received_message_time => "$arg_time", :last_received_message_tag => "$arg_tag"), :timeout => 5) do |conf|
+        nginx_run_server(config.merge(:last_received_message_time => "$arg_time", :last_received_message_tag => "$arg_tag")) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
 
@@ -295,7 +295,7 @@ describe "Subscriber Properties" do
         response = ""
         callback_function_name = "callback_function"
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
             sub_1 = EventMachine::HttpRequest.new(nginx_address + '/sub/' + channel.to_s + '?callback=' + callback_function_name).get :head => headers
@@ -313,7 +313,7 @@ describe "Subscriber Properties" do
         response = ""
         callback_function_name = "callback_function"
 
-        nginx_run_server(config, :timeout => 5) do |conf|
+        nginx_run_server(config) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
             publish_message_inline(channel, {}, body + "1")
@@ -333,7 +333,7 @@ describe "Subscriber Properties" do
         response = ""
         callback_function_name = "callback_function"
 
-        nginx_run_server(config.merge({:content_type => "anything/value"}), :timeout => 5) do |conf|
+        nginx_run_server(config.merge({:content_type => "anything/value"})) do |conf|
           EventMachine.run do
             publish_message_inline(channel, {}, body)
             sent_headers = headers.merge({'accept' => 'otherknown/value'})

misc/spec/subscriber/websocket_spec.rb

@@ -19,7 +19,7 @@ describe "Subscriber WebSocket" do
   end
 
   it "should check accepted methods" do
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       EventMachine.run do
         multi = EventMachine::MultiRequest.new
 
@@ -62,7 +62,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_check_mandatory_headers'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\n"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -108,7 +108,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_supported_versions'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\n"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}Sec-WebSocket-Version: 7\r\n\r\n")
       headers, body = read_response_on_socket(socket)
@@ -136,7 +136,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_response_headers'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -152,7 +152,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_receive_header_template'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config.merge(:header_template => "HEADER_TEMPLATE"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:header_template => "HEADER_TEMPLATE")) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       sleep(0.5)
@@ -165,7 +165,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_receive_ping_frame'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config.merge(:ping_message_interval => '1s'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:ping_message_interval => '1s')) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -180,7 +180,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_receive_close_frame'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s')) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -195,7 +195,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_receive_footer_template'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s', :footer_template => "FOOTER_TEMPLATE"), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:subscriber_connection_ttl => '1s', :footer_template => "FOOTER_TEMPLATE")) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -210,7 +210,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_receive_message_length_less_than_125'
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -229,7 +229,7 @@ describe "Subscriber WebSocket" do
 
     65535.times { message << "a" }
 
-    nginx_run_server(config.merge(:client_max_body_size => '65k', :client_body_buffer_size => '65k'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:client_max_body_size => '65k', :client_body_buffer_size => '65k')) do |conf|
       publish_message(channel, {}, message)
 
       socket = open_socket(nginx_host, nginx_port)
@@ -246,7 +246,7 @@ describe "Subscriber WebSocket" do
 
     65536.times { message << "a" }
 
-    nginx_run_server(config.merge(:client_max_body_size => '70k', :client_body_buffer_size => '70k'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:client_max_body_size => '70k', :client_body_buffer_size => '70k')) do |conf|
       publish_message(channel, {}, message)
 
       socket = open_socket(nginx_host, nginx_port)
@@ -260,7 +260,7 @@ describe "Subscriber WebSocket" do
     channel = 'ch_test_same_message_template_different_locations'
     body = 'body'
 
-    nginx_run_server(config.merge(:message_template => '{\"text\":\"~text~\"}', :subscriber_connection_ttl => '1s'), :timeout => 5) do |conf|
+    nginx_run_server(config.merge(:message_template => '{\"text\":\"~text~\"}', :subscriber_connection_ttl => '1s')) do |conf|
       publish_message(channel, {}, body)
 
       request_1 = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
@@ -302,7 +302,7 @@ describe "Subscriber WebSocket" do
 
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(configuration, :timeout => 5) do |conf|
+    nginx_run_server(configuration) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -341,7 +341,7 @@ describe "Subscriber WebSocket" do
 
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)
@@ -369,7 +369,7 @@ describe "Subscriber WebSocket" do
 
     request = "GET /ws/#{channel}.b1 HTTP/1.0\r\nConnection: Upgrade\r\nSec-WebSocket-Key: /mQoZf6pRiv8+6o72GncLQ==\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n"
 
-    nginx_run_server(config, :timeout => 5) do |conf|
+    nginx_run_server(config) do |conf|
       socket = open_socket(nginx_host, nginx_port)
       socket.print("#{request}\r\n")
       headers, body = read_response_on_socket(socket)