Improve specs stability.

Use benchmark_unit for perf specs. Kill daemon processes in daemonizing specs. Add error message before running spec if missing required gem.
mkwiatkowski · Jan 20, 2008 · d50a45e · d50a45e
1 parent b698fe8
commit d50a45e
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 15 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 == 0.5.5 Pony release
+ * Improve specs stability.
  * Move request body to a Tempfile if too big (> 112 MB)
  * Remove useless check for max header size in Request (already done in the parser)
 

diff --git a/Rakefile b/Rakefile
@@ -8,4 +8,4 @@ require 'lib/thin'
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
-task :default => [:compile, :spec]
+task :default => :spec
diff --git a/lib/thin/daemonizing.rb b/lib/thin/daemonizing.rb
@@ -26,7 +26,7 @@ def self.included(base)
     end
 
     def pid
-      File.exist?(pid_file) ? open(pid_file).read : nil
+      File.exist?(pid_file) ? open(pid_file).read.to_i : nil
     end
 
     # Turns the current script into a daemon process that detaches from the console.

diff --git a/spec/daemonizing_spec.rb b/spec/daemonizing_spec.rb
@@ -89,5 +89,6 @@
 
   after do
     Process.kill(9, @pid.to_i) if @pid && Process.running?(@pid.to_i)
+    Process.kill(9, @server.pid) if @server.pid && Process.running?(@server.pid)
   end
 end
diff --git a/spec/request_spec.rb b/spec/request_spec.rb
@@ -209,8 +209,8 @@
     proc { R("GET / HTTP/1.1\r\n#{big_headers}\r\n") }.should raise_error(InvalidRequest)
   end
 
-  it "should be faster then #{max_parsing_time = 0.2} ms" do
-    body = <<-EOS.chomp
+  it "should be faster then #{max_parsing_time = 0.0002} RubySeconds" do
+    body = <<-EOS.chomp.gsub("\n", "\r\n")
 POST /postit HTTP/1.1
 Host: localhost:3000
 User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/2.0.0.9
@@ -226,7 +226,7 @@
 hi=there&name=marc&[email protected]
 EOS
 
-    proc { R(body, true) }.should be_faster_then(max_parsing_time)
+    proc { R(body) }.should be_faster_then(max_parsing_time)
   end
 
   it 'should be comparable to Mongrel parser' do

diff --git a/spec/response_spec.rb b/spec/response_spec.rb
@@ -52,7 +52,7 @@
     out.should include("\r\n\r\n<html></html>")
   end
 
-  it "should be faster then #{max_parsing_time = 0.07} ms" do
+  it "should be faster then #{max_parsing_time = 0.00011} ms" do
     @response.body << <<-EOS
 <html><head><title>Dir listing</title></head>
 <body><h1>Listing stuff</h1><ul>

diff --git a/spec/server_spec.rb b/spec/server_spec.rb
@@ -49,12 +49,12 @@
     post('/', :big => big).size.should == big.size + 4
   end
 
-  it "should handle GET in less then #{get_request_time = 5} ms" do
+  it "should handle GET in less then #{get_request_time = 0.004} RubySecond" do
     proc { get('/') }.should be_faster_then(get_request_time)
   end
 
-  it "should handle POST in less then #{post_request_time = 6} ms" do
-    proc { post('/', :file => 'X' * 1000) }.should be_faster_then(get_request_time)
+  it "should handle POST in less then #{post_request_time = 0.007} RubySecond" do
+    proc { post('/', :file => 'X' * 1000) }.should be_faster_then(post_request_time)
   end
 
   after do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,6 +4,7 @@
 require 'benchmark'
 require 'timeout'
 require 'fileutils'
+require 'benchmark_unit'
 
 include Thin
 
@@ -31,14 +32,33 @@ def initialize(max_time)
       @max_time = max_time
     end
 
-    def matches?(target)
-      @target = target
-      @time = Benchmark.measure { @target.call }.real * 1000
-      @time <= @max_time
+    # Base on benchmark_unit/assertions#compare_benchmarks
+    def matches?(proc)
+      @time, multiplier = 0, 1
+
+      while (@time < 0.01) do
+        @time = Benchmark::Unit.measure do 
+          multiplier.times &proc
+        end
+        multiplier *= 10
+      end
+
+      multiplier /= 10
+
+      iterations = (Benchmark::Unit::CLOCK_TARGET / @time).to_i * multiplier
+      iterations = 1 if iterations < 1
+
+      total = Benchmark::Unit.measure do 
+        iterations.times &proc
+      end
+
+      @time = total / iterations
+
+      @time < @max_time
     end
 
     def failure_message(less_more=:less)
-      "took #{@time} ms, should take #{less_more} then #{@max_time} ms"
+      "took <#{@time.inspect} RubySeconds>, should take #{less_more} than #{@max_time} RubySeconds."
     end
 
     def negative_failure_message

diff --git a/tasks/gem.rake b/tasks/gem.rake
@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   end
 
   s.files                 = %w(COPYING CHANGELOG README Rakefile) +
-                            Dir.glob("{benchmark,bin,doc,example,lib,spec}/**/*") + 
+                            Dir.glob("{benchmark,bin,doc,example,lib,spec,tasks}/**/*") + 
                             Dir.glob("ext/**/*.{h,c,rb,rl}")
 
   if WIN

diff --git a/tasks/spec.rake b/tasks/spec.rake
@@ -12,4 +12,15 @@ else
   Spec::Rake::SpecTask.new('spec') do |t|
     t.spec_files = FileList['spec/**/*_spec.rb']
   end
+
+  task :check_spec_gems do
+    begin
+      require 'spec'
+      require 'benchmark_unit'
+    rescue LoadError
+      abort "To run specs, install rspec and benchmark_unit gems"
+    end
+  end
+
+  task :spec => [:check_spec_gems, :compile]
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ require 'lib/thin'

		Dir['tasks/*/.rake'].each { \|rake\| load rake }

		task :default => [:compile, :spec]
		task :default => :spec
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ def self.included(base) @@
         end
         def pid
-          File.exist?(pid_file) ? open(pid_file).read : nil
+          File.exist?(pid_file) ? open(pid_file).read.to_i : nil
         end
         # Turns the current script into a daemon process that detaches from the console.
@@ Expand Down @@