parallel_tests 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/bin/parallel_test

@@ -63,22 +63,21 @@ else
   num_tests = groups.inject(0){|sum,item| sum + item.size }
   puts "#{num_processes} processes for #{num_tests} #{name}s, ~ #{num_tests / groups.size} #{name}s per process"
 
-  output = Parallel.map(groups, :in_processes => num_processes) do |group|
+  test_results = Parallel.map(groups, :in_processes => num_processes) do |group|
     klass.run_tests(group, groups.index(group), options[:test_options])
   end
 
   #parse and print results
-  results = klass.find_results(output*"")
+  results = klass.find_results(test_results.map{|result| result[:stdout] }*"")
   puts ""
   puts "Results:"
-  results.each{|r| puts r}
+  results.each{|r| puts r }
 
   #report total time taken
   puts ""
   puts "Took #{Time.now - start} seconds"
 
-  #exit with correct status code
-  # - rake parallel:test && echo 123 ==> 123 should not show up when test failed
-  # - rake parallel:test db:reset ==> works when tests succeed
-  abort "#{name.capitalize}s Failed" if klass.failed?(results)
+  #exit with correct status code so rake parallel:test && echo 123 works
+  failed = test_results.any?{|result| result[:exit_status] != 0 }
+  abort "#{name.capitalize}s Failed" if failed
 end

data/lib/parallel_cucumber.rb

@@ -4,7 +4,7 @@ class ParallelCucumber < ParallelTests
   def self.run_tests(test_files, process_number, options)
     color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
     cmd = "#{color} #{executable} #{options} #{test_files*' '}"
-    execute_command(cmd, process_number)[:stdout]
+    execute_command(cmd, process_number)
   end
 
   def self.executable
@@ -26,8 +26,4 @@ class ParallelCucumber < ParallelTests
   def self.line_is_result?(line)
     line =~ /^\d+ (steps|scenarios)/
   end
-
-  def self.line_is_failure?(line)
-    line =~ /^\d+ (steps|scenarios).*(\d{2,}|[1-9]) failed/
-  end
 end

data/lib/parallel_specs.rb

@@ -4,7 +4,7 @@ class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
     exe = executable # its expensive with bundler, so do not call it twice
     cmd = "#{color} #{exe} #{options} #{spec_opts(exe)} #{test_files*' '}"
-    execute_command(cmd, process_number)[:stdout]
+    execute_command(cmd, process_number)
   end
 
   def self.executable

data/lib/parallel_tests.rb

@@ -31,7 +31,7 @@ class ParallelTests
   def self.run_tests(test_files, process_number, options)
     require_list = test_files.map { |filename| "\"#{filename}\"" }.join(",")
     cmd = "ruby -Itest #{options} -e '[#{require_list}].each {|f| require f }'"
-    execute_command(cmd, process_number)[:stdout]
+    execute_command(cmd, process_number)
   end
 
   def self.execute_command(cmd, process_number)
@@ -56,11 +56,6 @@ class ParallelTests
     }.compact
   end
 
-  def self.failed?(results)
-    return true if results.empty?
-    !! results.detect{|line| line_is_failure?(line)}
-  end
-
   def self.test_env_number(process_number)
     process_number == 0 ? '' : process_number + 1
   end
@@ -87,10 +82,6 @@ class ParallelTests
     line =~ /\d+ failure/
   end
 
-  def self.line_is_failure?(line)
-    line =~ /(\d{2,}|[1-9]) (failure|error)/
-  end
-
   def self.test_suffix
     "_test.rb"
   end
@@ -120,4 +111,4 @@ class ParallelTests
       Dir["#{root}**/**/*#{self.test_suffix}"]
     end
   end
-end
+end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-02-04}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.files = [

data/spec/integration_spec.rb

@@ -29,7 +29,7 @@ describe 'CLI' do
   end
 
   def run_specs(options={})
-    `cd #{folder} && #{executable} -t spec -n #{options[:processes]||2} #{options[:add]} 2>&1 && echo 'i ran!'`
+    `cd #{folder} && #{executable} -t spec -n #{options[:processes]||2} #{options[:add]} 2>&1`
   end
 
   it "runs tests in parallel" do
@@ -45,8 +45,7 @@ describe 'CLI' do
     result.scan('1 example, 0 failure').size.should == 4 # 2 results + 2 result summary
     result.scan(/Finished in \d+\.\d+ seconds/).size.should == 2
     result.scan(/Took \d+\.\d+ seconds/).size.should == 1 # parallel summary
-
-    result.should include('i ran!')
+    $?.success?.should == true
   end
 
   it "fails when tests fail" do
@@ -56,8 +55,7 @@ describe 'CLI' do
 
     result.scan('1 example, 1 failure').size.should == 2
     result.scan('1 example, 0 failure').size.should == 2
-    result.should =~ /specs failed/i
-    result.should_not include('i ran!')
+    $?.success?.should == false
   end
 
   it "can exec given commands with ENV['TEST_ENV_NUM']" do

data/spec/parallel_cucumber_spec.rb

@@ -24,7 +24,7 @@ describe ParallelCucumber do
       io = open('spec/spec_helper.rb')
       ParallelCucumber.stub!(:print)
       ParallelCucumber.should_receive(:open).and_return io
-      ParallelCucumber.run_tests(['xxx'],1,'').should =~ /\$LOAD_PATH << File/
+      ParallelCucumber.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
     end
 
     it "runs bundle exec cucumber when on bundler 0.9" do
@@ -69,34 +69,4 @@ EOF
       ParallelCucumber.find_results(output).should == ["7 scenarios (3 failed, 4 passed)", "33 steps (3 failed, 2 skipped, 28 passed)", "4 scenarios (4 passed)", "40 steps (40 passed)"]
     end
   end
-
-  describe :failed do
-    it "fails with single failed" do
-      ParallelCucumber.failed?(['40 steps (40 passed)','33 steps (3 failed, 2 skipped, 28 passed)']).should == true
-    end
-
-    it "fails with multiple failed tests" do
-      ParallelCucumber.failed?(['33 steps (3 failed, 2 skipped, 28 passed)','33 steps (3 failed, 2 skipped, 28 passed)']).should == true
-    end
-    
-    it "fails with a single scenario failure during setup phase" do
-      ParallelCucumber.failed?(['1 scenarios (1 failed)']).should == true
-    end
-
-    it "fails with scenario failures during setup phase when other steps pass" do
-      ParallelCucumber.failed?(['7 scenarios (3 failed, 4 passed)','40 steps (40 passed)']).should == true
-    end
-
-    it "does not fail with successful tests" do
-      ParallelCucumber.failed?(['4 scenarios (4 passed)','40 steps (40 passed)','4 scenarios (4 passed)','40 steps (40 passed)']).should == false
-    end
-
-    it "does not fail with 0 failures" do
-      ParallelCucumber.failed?(['4 scenarios (4 passed 0 failed)','40 steps (40 passed 0 failed)','4 scenarios (4 passed 0 failed)','40 steps (40 passed)']).should == false
-    end
-
-    it "does fail with 10 failures" do
-      ParallelCucumber.failed?(['40 steps (40 passed 10 failed)','40 steps (40 passed)']).should == true
-    end
-  end
-end
+end

data/spec/parallel_specs_spec.rb

@@ -111,7 +111,7 @@ describe ParallelSpecs do
       io = open('spec/spec_helper.rb')
       ParallelSpecs.stub!(:print)
       ParallelSpecs.should_receive(:open).and_return io
-      ParallelSpecs.run_tests(['xxx'],1,'').should =~ /\$LOAD_PATH << File/
+      ParallelSpecs.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 
@@ -146,23 +146,4 @@ EOF
       ParallelSpecs.find_results(output).should == ['0 examples, 0 failures, 0 pending','1 examples, 1 failures, 1 pending']
     end
   end
-
-  describe :failed do
-    it "fails with single failed specs" do
-      ParallelSpecs.failed?(['0 examples, 0 failures, 0 pending','1 examples, 1 failure, 1 pending']).should == true
-    end
-
-    it "fails with multiple failed specs" do
-      ParallelSpecs.failed?(['0 examples, 1 failure, 0 pending','1 examples, 111 failures, 1 pending']).should == true
-    end
-
-    it "does not fail with successful specs" do
-      ParallelSpecs.failed?(['0 examples, 0 failures, 0 pending','1 examples, 0 failures, 1 pending']).should == false
-    end
-
-    it "does fail with 10 failures" do
-      ParallelSpecs.failed?(['0 examples, 10 failures, 0 pending','1 examples, 0 failures, 1 pending']).should == true
-    end
-
-  end
-end
+end

data/spec/parallel_tests_spec.rb

@@ -45,7 +45,7 @@ describe ParallelTests do
       io = open('spec/spec_helper.rb')
       ParallelTests.stub!(:print)
       ParallelTests.should_receive(:open).and_return io
-      ParallelTests.run_tests(['xxx'],1,'').should =~ /\$LOAD_PATH << File/
+      ParallelTests.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 
@@ -103,40 +103,6 @@ EOF
     end
   end
 
-  describe :failed do
-    it "fails with single failed" do
-      ParallelTests.failed?(['10 tests, 20 assertions, 0 failures, 0 errors','10 tests, 20 assertions, 1 failure, 0 errors']).should == true
-    end
-
-    it "fails with single error" do
-      ParallelTests.failed?(['10 tests, 20 assertions, 0 failures, 1 errors','10 tests, 20 assertions, 0 failures, 0 errors']).should == true
-    end
-
-    it "fails with failed and error" do
-      ParallelTests.failed?(['10 tests, 20 assertions, 0 failures, 1 errors','10 tests, 20 assertions, 1 failures, 1 errors']).should == true
-    end
-
-    it "fails with multiple failed tests" do
-      ParallelTests.failed?(['10 tests, 20 assertions, 2 failures, 0 errors','10 tests, 1 assertion, 1 failures, 0 errors']).should == true
-    end
-
-    it "does not fail with successful tests" do
-      ParallelTests.failed?(['10 tests, 20 assertions, 0 failures, 0 errors','10 tests, 20 assertions, 0 failures, 0 errors']).should == false
-    end
-
-    it "does fail with 10 failures" do
-      ParallelTests.failed?(['10 tests, 20 assertions, 10 failures, 0 errors','10 tests, 20 assertions, 0 failures, 0 errors']).should == true
-    end
-
-    it "is not failed with empty results" do
-      ParallelTests.failed?(['0 tests, 0 assertions, 0 failures, 0 errors']).should == false
-    end
-
-    it "is failed when there are no results" do
-      ParallelTests.failed?([]).should == true
-    end
-  end
-
   describe :bundler_enabled? do
     before do
       Object.stub!(:const_defined?).with(:Bundler).and_return false
@@ -173,4 +139,4 @@ EOF
   it "has a version" do
     ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency