hatetepe 0.4.1 → 0.5.0.pre

data/spec/integration/client/timeout_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+require "hatetepe/client"
+require "hatetepe/server"
+
+describe Hatetepe::Client do
+  let :options do
+    { host: "127.0.0.1", port: 3123 }
+  end
+
+  let :options2 do
+    { host: "1.2.3.4",   port: 3123}
+  end
+
+  let :client do
+    Hatetepe::Client.start(options)
+  end
+
+  before do
+    Hatetepe::Server.start(options.merge(timeout: 0))
+  end
+
+  it "times out after 5 seconds of connection inactivity" do
+    # only verify that 5 seconds is the default, but actually
+    # use a smaller timeout to keep specs fast
+    Hatetepe::Client::CONFIG_DEFAULTS[:timeout].should == 5
+  end
+
+  it "times out after 5 seconds trying to establish a connection" do
+    # only verify that 5 seconds is the default, but actually
+    # use a smaller timeout to keep specs fast
+    Hatetepe::Client::CONFIG_DEFAULTS[:connect_timeout].should == 5
+  end
+
+  describe "with :timeout option" do
+    let :client do
+      Hatetepe::Client.start(options.merge(timeout: 0.5))
+    end
+
+    it "times out after n seconds of connection inactivity" do
+      client.should_not be_closed
+      EM::Synchrony.sleep(0.45)
+      client.should_not be_closed
+
+      EM::Synchrony.sleep(0.1)
+      client.should     be_closed
+      client.should     be_closed_by_timeout
+      client.should_not be_closed_by_connect_timeout
+    end
+  end
+
+  describe "with :timeout set to 0" do
+    let :client do
+      Hatetepe::Client.start(options.merge(timeout: 0))
+    end
+
+    it "never times out" do
+      client.should_not be_closed
+      EM::Synchrony.sleep(0.55)
+      client.should_not be_closed
+    end
+  end
+
+  describe "with :connect_timeout option" do
+    let :client do
+      Hatetepe::Client.start(options2.merge(connect_timeout: 0.5))
+    end
+
+    # this example fails if there's no network connection
+    it "times out after n seconds trying to establish a connection" do
+      client.should_not be_closed
+      EM::Synchrony.sleep(0.45)
+      client.should_not be_closed
+
+      EM::Synchrony.sleep(0.1)
+      client.should     be_closed
+      client.should     be_closed_by_connect_timeout
+      client.should_not be_closed_by_timeout
+    end
+  end
+
+  describe "with :connect_timeout set to 0" do
+    let :client do
+      Hatetepe::Client.start(options2.merge(connect_timeout: 0))
+    end
+
+    # this example fails if there's no network connection
+    it "never times out trying to establish a connection" do
+      client.should_not be_closed
+      EM::Synchrony.sleep(0.55)
+      client.should_not be_closed
+    end
+  end
+end

data/spec/integration/server/keep_alive_spec.rb

@@ -1,99 +1,27 @@
 require "spec_helper"
-require "hatetepe/cli"
+require "hatetepe/client"
 require "hatetepe/server"
 
 describe Hatetepe::Server, "with Keep-Alive" do
-  before do
-    $stderr = StringIO.new
-    
-    FakeFS.activate!
-    File.open "config.ru", "w" do |f|
-      f.write 'run proc {|env| [200, {"Content-Type" => "text/plain"}, []] }'
-    end
-  end
-  
-  after do
-    $stderr = STDERR
-    
-    FakeFS.deactivate!
-    FakeFS::FileSystem.clear
-  end
-  
-  let :client do
-    Hatetepe::Client.start :host => "127.0.0.1", :port => 30001
-  end
-  
-  let :server do
-    Hatetepe::Server.any_instance
-  end
-  
-  it "keeps the connection open for 1 seconds by default" do
-    command "-p 30001", 1.1 do
-      client
-      EM::Synchrony.sleep 0.95
-      client.should_not be_closed
-      EM::Synchrony.sleep 0.1
-      client.should be_closed
-    end
-  end
-  
   describe "and :timeout option" do
-    it "times out the connection after the specified amount of time" do
-      command "-p 30001 -t 0.5", 0.6 do
-        client
-        EM::Synchrony.sleep 0.45
-        client.should_not be_closed
-        EM::Synchrony.sleep 0.1
-        client.should be_closed_by_remote
-      end
-    end
+    it "times out the connection after the specified amount of time"
   end
   
   describe "and :timeout option set to 0" do
-    it "keeps the connection open until the client closes it" do
-      command "-p 30001 -t 0", 2 do
-        client
-        EM::Synchrony.sleep 1.95
-        client.should_not be_closed
-      end
-    end
-  end
-  
-  it "closes the connection if the client sends Connection: close" do
-    command "-p 30001" do
-      client.get("/", "Connection" => "close").tap do |response|
-        response.headers["Connection"].should == "close"
-        EM::Synchrony.sync response.body
-        client.should be_closed_by_remote
-      end
-    end
+    it "keeps the connection open until the client closes it"
   end
   
-  it "sends Connection: keep-alive if the client also sends it" do
-    command "-p 30001" do
-      client.get("/", "Connection" => "keep-alive").tap do |response|
-        response.headers["Connection"].should == "keep-alive"
-      end
-    end
-  end
+  it "closes the connection if the client sends Connection: close"
+
+  it "responds with Connection: keep-alive if the client also sent it"
   
   ["1.0", "0.9"].each do |version|
     describe "and an HTTP #{version} client" do
-      after { ENV.delete "DEBUG_KEEP_ALIVE" }
-      
       it "closes the connection after one request" do
         pending "http_parser.rb doesn't parse HTTP/0.9" if version == "0.9"
-        
-        ENV["DEBUG_KEEP_ALIVE"] = "yes please"
-        
-        command "-p 30001" do
-          client.get("/", {"Connection" => ""}, nil, version).tap do |response|
-            response.headers["Connection"].should == "close"
-            EM::Synchrony.sync response.body
-            client.should be_closed_by_remote
-          end
-        end
       end
+
+      it "doesn't close the connection if the client sent Connection: Keep-Alive"
     end
   end
 end

data/spec/integration/server/timeout_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+require "hatetepe/client"
+require "hatetepe/server"
+
+describe Hatetepe::Server do
+  let :options do
+    { host: "127.0.0.1", port: 3123 }
+  end
+
+  let :client do
+    Hatetepe::Client.start(options.merge(timeout: 0))
+  end
+
+  it "times out after 5 seconds of connection inactivity" do
+    # only verify that 5 seconds is the default
+    Hatetepe::Server::CONFIG_DEFAULTS[:timeout].should == 5
+  end
+
+  describe "with :timeout option" do
+    before do
+      Hatetepe::Server.start(options.merge(timeout: 0.5))
+    end
+
+    it "times out after the specified amount of seconds" do
+      client.should_not be_closed
+      EM::Synchrony.sleep(0.45)
+      client.should_not be_closed
+
+      EM::Synchrony.sleep(0.1)
+      client.should be_closed_by_remote
+    end
+  end
+
+  describe "with :timeout set to 0" do
+    before do
+      Hatetepe::Server.start(options.merge(timeout: 0))
+    end
+
+    it "never times out" do
+      client.should_not be_closed
+      EM::Synchrony.sleep(0.55)
+      client.should_not be_closed
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,68 +1,16 @@
 begin
   require "awesome_print"
-rescue LoadError; end
+rescue LoadError
+end
 
 require "em-synchrony"
-require "fakefs/safe"
 
-RSpec.configure do |config|
-  config.before :each do
-    ENV["RACK_ENV"] = "testing"
-  end
-  
-  config.before :all do
-    EM.class_eval do
-      class << self
-        attr_reader :spec_hooks
-        def synchrony_with_hooks(blk = nil, tail = nil, &block)
-          synchrony_without_hooks do
-            (blk || block).call
-            @spec_hooks.each &:call
-          end
-        end
-        alias_method :synchrony_without_hooks, :synchrony
-        alias_method :synchrony, :synchrony_with_hooks
-      end
-    end
-  end
-  
-  config.after :all do
-    EM.class_eval do
-      class << self
-        remove_method :spec_hooks
-        alias_method :synchrony, :synchrony_without_hooks
-        remove_method :synchrony_with_hooks
-      end
-    end
-  end
-  
-  config.before :each do
-    EM.instance_variable_set :@spec_hooks, []
-  end
-  
-  config.after :each do
-    EM.instance_variable_set :@spec_hooks, nil
-  end
-  
-  def secure_reactor(timeout = 0.05, &expectations)
-    finished = false
-    location = caller[0]
-    
-    EM.spec_hooks << proc do
-      EM.add_timer(timeout) do
-        EM.stop
-        fail "Timeout exceeded" unless finished
-      end
-    end
-    EM.spec_hooks << proc do
-      expectations.call
-      finished = true
+RSpec.configure do |c|
+  c.around do |example|
+    EM.synchrony do
+      EM.heartbeat_interval = 0.01
+      example.call
       EM.next_tick { EM.stop }
     end
   end
-  
-  def command(opts, timeout = 0.5, &expectations)
-    secure_reactor timeout, &expectations
-    Hatetepe::CLI.start opts.split
-  end
 end