ngauthier-multitest 0.1.0 → 0.1.1

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+tmp

data/README.rdoc

@@ -2,45 +2,76 @@
 
 == Caveats
 
-Multitest currently is not really tested and working with databases all that well. I have a project in Postgres with all of my data done transactionally during the test via factory_girl. It works there. But it didn't work on a quick test in a MySQL project.
-
 Multitest is still very young, it is in active development and is no where near complete or robust.
 
+Multitest currently only works in a rails environment. It's only because I use "constantize".
+
+If you depend on fixture data in your database, you may have data inconsistency errors. I like to use an empty DB and then use factories with transactional tests, and this runs great.
+
 == Installation
 
-gem install ngauthier-multitest
+  gem install ngauthier-multitest
 
 == Usage
 
 in your Rakefile:
 
-require 'multitest'
-require 'multitest/tasks'
+  require 'multitest'
+  require 'multitest/tasks'
 
 on the commandline:
 
-rake multitest
-rake multitest:units multitest:functionals multitest:integration
+  rake multitest
+  rake multitest:units multitest:functionals multitest:integration
 
 == Configuration
 
 in your Rakefile:
 
-Multitest.cores = 8
+  Multitest.cores = 8
+
+== Benchmarks
+
+This is one of our largest apps.
+
+=== Normal suite
+
+  time rake test
+  259.03user 27.50system 5:14.76elapsed 91%CPU
+
+=== 2 Cores
+
+  time rake multitest
+  213.86user 23.38system 2:41.24elapsed 147%CPU
+
+=== 4 Cores
+
+  time rake multitest
+  223.18user 24.53system 2:08.96elapsed 192%CPU
+
+Note the wall-time differences of 5:14 vs 2:41. 195% speedup on two cores. On 4 cores there is only a speedup of 243%, but that's still quicker. If you send me impressive benchmarks, I'll be happy to put them up here (8 cores anyone?).
+
+== Require Errors
+
+If you get require errors like:
 
-== Examples
+  Running multitest:units
+  rake aborted!
+  no such file to load -- test_helper
 
-On a small app that I have:
+Then you may want to use more absolute paths in your tests. For example, if you had:
 
-Normal suite
-time rake test
-16.38user 2.99system 0:20.38elapsed 95%CPU 
+  # test/unit/my_class.rb
+  require 'test_helper'
+  class MyClass < ActiveSupport::TestCase
+  end
 
-2 Cores:
-time rake multitest
-8.35user 1.64system 0:08.51elapsed 117%CPU
+You should change it to:
 
-Note the wall-time differences of 20.38 vs 8.51. 239% speedup on two cores.
+  # test/unit/my_class.rb
+  require File.join(File.dirname(__FILE__), '..', 'test_helper')
+  class MyClass < ActiveSupport::TestCase
+  end
 
 == Note on Patches/Pull Requests
  
@@ -50,7 +81,7 @@ Note the wall-time differences of 20.38 vs 8.51. 239% speedup on two cores.
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+  bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/multitest/multitest.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'pipe_dream')
+require File.join(File.dirname(__FILE__), 'safe_fork')
 require 'test/unit/testresult'
 require 'test/unit'
 
@@ -32,39 +33,27 @@ class Multitest
     $stderr.write @files.inspect+"\n"; $stderr.flush
     @cores.times do |c|
       @pipes << PipeDream.new
-      @children << Process.fork do
+      @children << SafeFork.fork do
         Signal.trap("TERM") { exit }
         Signal.trap("HUP") { exit }
         pipe = @pipes.last
         pipe.identify_as_child
         pipe.write("[Worker #{c}] Booted\n")
+        @result = Test::Unit::TestResult.new
+        @result.add_listener(Test::Unit::TestResult::FAULT) do |value|
+          $stderr.write value
+          $stderr.write "\n\n"
+          $stderr.flush
+        end
         while !pipe.eof?
           file = pipe.gets.chomp
           begin
             pipe.write "[Worker #{c} Starting: #{file}\n"
             start = Time.now
 
-            @result = Test::Unit::TestResult.new
-            @result.add_listener(Test::Unit::TestResult::FAULT) do |value|
-              # $stderr.write "\n"
-              $stderr.write value
-              $stderr.write "\n\n"
-              $stderr.flush
-            end
             klasses = Multitest.find_classes_in_file(file)
             klasses.each{|k| k.suite.run(@result){|status, name| ;}}
             
-            #puts @result
-            
-            #unless @result[:failures].empty?
-            #  puts @result[:failures].inspect
-            #end
-            
-            #unless @result.errors.empty?
-            #  puts @result.errors.inspect
-            #end
-            
-            
             finish = Time.now
             pipe.write "[Worker #{c}] Completed: #{file} (#{finish-start})\n"
           rescue => ex
@@ -119,8 +108,22 @@ class Multitest
   def self.find_classes_in_file(f)
     code = ""
     File.open(f) {|buffer| code = buffer.read}
-    matches = code.scan /class\s+([\S]+)/
-    klasses = matches.collect{|c| eval(c.first) }
+    matches = code.scan(/class\s+([\S]+)/)
+    klasses = matches.collect do |c|
+      begin
+        if c.first.respond_to? :constantize
+          c.first.constantize
+        else
+          eval(c.first)
+        end
+      rescue NameError
+        # $stderr.write "Could not load [#{c.first}] from [#{f}]\n"
+        nil
+      rescue SyntaxError
+        # $stderr.write "Could not load [#{c.first}] from [#{f}]\n"
+        nil
+      end
+    end
     return klasses.select{|k| k.respond_to? 'suite'}
   end
 

data/lib/multitest/safe_fork.rb

@@ -0,0 +1,24 @@
+class SafeFork
+  def self.fork
+    begin
+      # remove our connection so it doesn't get cloned
+      ActiveRecord::Base.remove_connection if defined?(ActiveRecord)
+      # fork a process
+      child = Process.fork do
+        begin
+          # create a new connection and perform the action
+          ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+          yield
+        ensure
+          # make sure we remove the connection before we're done
+          ActiveRecord::Base.remove_connection if defined?(ActiveRecord)
+        end      
+      end
+    ensure
+      # make sure we re-establish the connection before returning to the main instance
+      ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+    end
+    return child
+  end
+end
+

data/lib/multitest/tasks.rb

@@ -4,7 +4,7 @@ module Multitest::Tasks
   
   namespace :multitest do
     desc "Multi-core test:units"
-    task :units do
+    task :units => [:environment] do
       pattern = 'test/unit/**/*_test.rb'
       files = Dir.glob(pattern)
       $stderr.write "Running multitest:units\n"
@@ -12,7 +12,7 @@ module Multitest::Tasks
       $stderr.write "Completed multitest:units\n\n"
     end
     desc "Multi-core test:functionals"
-    task :functionals do
+    task :functionals => [:environment] do
       pattern = 'test/functional/**/*_test.rb'
       files = Dir.glob(pattern)
       $stderr.write "Running multitest:functionals\n"
@@ -20,7 +20,7 @@ module Multitest::Tasks
       $stderr.write "Completed multitest:functionals\n\n"
     end
     desc "Multi-core test:integration"
-    task :integration do
+    task :integration => [:environment] do
       pattern = 'test/integration/**/*_test.rb'
       files = Dir.glob(pattern)
       $stderr.write "Running multitest:integration\n"

data/multitest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multitest}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2009-09-24}
+  s.date = %q{2009-09-25}
   s.description = %q{Run your tests across multiple cores automatically.}
   s.email = %q{nick@smartlogicsolutions.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
      "lib/multitest/multitest.rb",
      "lib/multitest/pipe_dream.rb",
      "lib/multitest/pipe_dream.rb",
+     "lib/multitest/safe_fork.rb",
+     "lib/multitest/safe_fork.rb",
      "lib/multitest/tasks.rb",
      "lib/multitest/tasks.rb",
      "multitest.gemspec",

data/test/multitest_test.rb

@@ -4,12 +4,12 @@ require 'multitest'
 class MultitestTest < Test::Unit::TestCase
   context "a Multitest" do
     setup do
+      FileUtils.mkdir_p(File.join(File.dirname(__FILE__), '..', 'tmp'))
+      FileUtils.rm_rf(File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'test.log')))
       @mt = Multitest.new([
         File.expand_path(File.join(File.dirname(__FILE__), 'tests', 'sample_test.rb')),
         File.expand_path(File.join(File.dirname(__FILE__), 'tests', 'another_test.rb'))
       ])
-      FileUtils.mkdir_p(File.join(File.dirname(__FILE__), '..', 'tmp'))
-      FileUtils.rm_rf(File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'test.log')))
     end
     
     should "run three instances" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ngauthier-multitest
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ files:
 - lib/multitest.rb
 - lib/multitest/multitest.rb
 - lib/multitest/pipe_dream.rb
+- lib/multitest/safe_fork.rb
 - lib/multitest/tasks.rb
 - multitest.gemspec
 - test/multitest_test.rb