parallel_tests 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.9.1)
+    parallel_tests (0.9.2)
       parallel
 
 GEM

data/lib/parallel_tests/cli.rb

@@ -28,7 +28,7 @@ module ParallelTest
         report_number_of_tests(runner, groups)
 
         test_results = Parallel.map(groups, :in_processes => groups.size) do |group|
-          run_tests(runner, group, groups.index(group), options)
+          run_tests(runner, group, groups.index(group), num_processes, options)
         end
 
         report_results(runner, test_results)
@@ -37,11 +37,11 @@ module ParallelTest
       abort final_fail_message(lib) if any_test_failed?(test_results)
     end
 
-    def self.run_tests(runner, group, process_number, options)
+    def self.run_tests(runner, group, process_number, num_processes, options)
       if group.empty?
         {:stdout => '', :exit_status => 0}
       else
-        runner.run_tests(group, process_number, options)
+        runner.run_tests(group, process_number, num_processes, options)
       end
     end
 
@@ -128,11 +128,11 @@ TEXT
       runs = (0...num_processes).to_a
       results = if options[:non_parallel]
         runs.map do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, options)
+          ParallelTests::Test::Runner.execute_command(command, i, num_processes)
         end
       else
         Parallel.map(runs, :in_processes => num_processes) do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, options)
+          ParallelTests::Test::Runner.execute_command(command, i, num_processes)
         end
       end.flatten
 

data/lib/parallel_tests/cucumber/runner.rb

@@ -3,7 +3,7 @@ require 'parallel_tests/test/runner'
 module ParallelTests
   module Cucumber
     class Runner < ParallelTests::Test::Runner
-      def self.run_tests(test_files, process_number, options)
+      def self.run_tests(test_files, process_number, num_processes, options)
         color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
         runtime_logging = " --format ParallelTests::Cucumber::RuntimeLogger --out #{runtime_log}"
         cmd = [
@@ -13,7 +13,7 @@ module ParallelTests
           cucumber_opts(options[:test_options]),
           *test_files
         ].compact.join(" ")
-        execute_command(cmd, process_number, options)
+        execute_command(cmd, process_number, num_processes)
       end
 
       def self.executable

data/lib/parallel_tests/rspec/runner.rb

@@ -3,11 +3,11 @@ require 'parallel_tests/test/runner'
 module ParallelTests
   module RSpec
     class Runner < ParallelTests::Test::Runner
-      def self.run_tests(test_files, process_number, options)
+      def self.run_tests(test_files, process_number, num_processes, options)
         exe = executable # expensive, so we cache
         version = (exe =~ /\brspec\b/ ? 2 : 1)
         cmd = "#{rspec_1_color if version == 1}#{exe} #{options[:test_options]} #{rspec_2_color if version == 2}#{spec_opts} #{test_files*' '}"
-        execute_command(cmd, process_number, options)
+        execute_command(cmd, process_number, num_processes)
       end
 
       def self.executable

data/lib/parallel_tests/test/runner.rb

@@ -15,10 +15,10 @@ module ParallelTests
         "test"
       end
 
-      def self.run_tests(test_files, process_number, options)
+      def self.run_tests(test_files, process_number, num_processes, options)
         require_list = test_files.map { |filename| %{"#{File.expand_path filename}"} }.join(",")
         cmd = "ruby -Itest -e '[#{require_list}].each {|f| require f }' -- #{options[:test_options]}"
-        execute_command(cmd, process_number, options)
+        execute_command(cmd, process_number, num_processes)
       end
 
       def self.line_is_result?(line)
@@ -39,8 +39,9 @@ module ParallelTests
         Grouper.in_even_groups_by_size(tests, num_groups, options)
       end
 
-      def self.execute_command(cmd, process_number, options)
-        cmd = "TEST_ENV_NUMBER=#{test_env_number(process_number)} ; export TEST_ENV_NUMBER; #{cmd}"
+      def self.execute_command(cmd, process_number,  num_processes)
+        prefix = "PARALLEL_TEST_GROUPS=#{ num_processes } ; export PARALLEL_TEST_GROUPS;"
+        cmd = "#{prefix} TEST_ENV_NUMBER=#{test_env_number(process_number)} ; export TEST_ENV_NUMBER; #{cmd}"
         f = open("|#{cmd}", 'r')
         output = fetch_output(f)
         f.close

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.9.1'
+  VERSION = Version = '0.9.2'
 end

data/spec/parallel_tests/cucumber/runner_spec.rb

@@ -16,41 +16,46 @@ describe ParallelTests::Cucumber do
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      call(['xxx'],0,{})
+      call(['xxx'],0,22,{})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
+    end
+
+    it 'sets PARALLEL_TEST_GROUPS so child processes know that they are being run under parallel_tests' do
+      ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x=~/PARALLEL_TEST_GROUPS=22/}.and_return mocked_process
+      call(['xxx'],1,22,{})
     end
 
     it "returns the output" do
       io = open('spec/spec_helper.rb')
       $stdout.stub!(:print)
       ParallelTests::Cucumber::Runner.should_receive(:open).and_return io
-      call(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
+      call(['xxx'],1,22,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
 
     it "runs bundle exec cucumber when on bundler 0.9" do
       ParallelTests.stub!(:bundler_enabled?).and_return true
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{bundle exec cucumber}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs script/cucumber when script/cucumber is found" do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs cucumber by default" do
       File.stub!(:file?).with('script/cucumber').and_return false
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x !~ %r{(script/cucumber)|(bundle exec cucumber)}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses options passed in" do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* -p default}}.and_return mocked_process
-      call(['xxx'],1,:test_options => '-p default')
+      call(['xxx'],1,22,:test_options => '-p default')
     end
 
     context "with parallel profile in config/cucumber.yml" do
@@ -62,17 +67,17 @@ describe ParallelTests::Cucumber do
 
       it "uses parallel profile" do
         ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* foo bar --profile parallel xxx}}.and_return mocked_process
-        call(['xxx'],1, :test_options => 'foo bar')
+        call(['xxx'],1,22, :test_options => 'foo bar')
       end
 
       it "uses given profile via --profile" do
         ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* --profile foo xxx$}}.and_return mocked_process
-        call(['xxx'],1, :test_options => '--profile foo')
+        call(['xxx'],1,22, :test_options => '--profile foo')
       end
 
       it "uses given profile via -p" do
         ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* -p foo xxx$}}.and_return mocked_process
-        call(['xxx'],1, :test_options => '-p foo')
+        call(['xxx'],1,22, :test_options => '-p foo')
       end
     end
 
@@ -81,13 +86,13 @@ describe ParallelTests::Cucumber do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* foo bar}}.and_return mocked_process
       Dir.should_receive(:glob).and_return ['config/cucumber.yml']
       File.should_receive(:read).with('config/cucumber.yml').and_return file_contents
-      call(['xxx'],1,:test_options => 'foo bar')
+      call(['xxx'],1,22,:test_options => 'foo bar')
     end
 
     it "does not use the parallel profile if config/cucumber.yml does not exist" do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .*}}.and_return mocked_process
       Dir.should_receive(:glob).and_return []
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
   end
 

data/spec/parallel_tests/rspec/runner_spec.rb

@@ -18,38 +18,43 @@ describe ParallelTests::RSpec::Runner do
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      call(['xxx'], 0, {})
+      call(['xxx'], 0, 22, {})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
+    end
+
+    it 'sets PARALLEL_TEST_GROUPS so child processes know that they are being run under parallel_tests' do
+      ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x=~/PARALLEL_TEST_GROUPS=22/}.and_return mocked_process
+      call(['xxx'],1,22,{})
     end
 
     it "runs with color when called from cmdline" do
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x=~/ --tty /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return true
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs without color when not called from cmdline" do
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x !~ / --tty /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return false
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs with color for rspec 1 when called for the cmdline" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x=~/ RSPEC_COLOR=1 /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return true
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs without color for rspec 1 when not called for the cmdline" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x !~ / RSPEC_COLOR=1 /}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return false
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "run bundle exec spec when on bundler rspec 1" do
@@ -57,7 +62,7 @@ describe ParallelTests::RSpec::Runner do
       ParallelTests.stub!(:bundler_enabled?).and_return true
       ParallelTests::RSpec::Runner.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{bundle exec spec}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "run bundle exec rspec when on bundler rspec 2" do
@@ -65,46 +70,46 @@ describe ParallelTests::RSpec::Runner do
       ParallelTests.stub!(:bundler_enabled?).and_return true
       ParallelTests::RSpec::Runner.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.0.2"
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{bundle exec rspec}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs script/spec when script/spec can be found" do
       File.should_receive(:file?).with('script/spec').and_return true
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{script/spec}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "runs spec when script/spec cannot be found" do
       File.stub!(:file?).with('script/spec').and_return false
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x !~ %r{script/spec}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses no -O when no opts where found" do
       File.stub!(:file?).with('spec/spec.opts').and_return false
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x !~ %r{spec/spec.opts}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses -O spec/spec.opts when found (with script/spec)" do
       File.stub!(:file?).with('script/spec').and_return true
       File.stub!(:file?).with('spec/spec.opts').and_return true
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+ -O spec/spec.opts}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses -O spec/parallel_spec.opts when found (with script/spec)" do
       File.stub!(:file?).with('script/spec').and_return true
       File.should_receive(:file?).with('spec/parallel_spec.opts').and_return true
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+ -O spec/parallel_spec.opts}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses -O .rspec_parallel when found (with script/spec)" do
       File.stub!(:file?).with('script/spec').and_return true
       File.should_receive(:file?).with('.rspec_parallel').and_return true
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+ -O .rspec_parallel}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses -O spec/parallel_spec.opts with rspec1" do
@@ -114,7 +119,7 @@ describe ParallelTests::RSpec::Runner do
       ParallelTests::RSpec::Runner.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-1.0.2"
 
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{spec\s+ -O spec/parallel_spec.opts}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses -O spec/parallel_spec.opts with rspec2" do
@@ -124,19 +129,19 @@ describe ParallelTests::RSpec::Runner do
       ParallelTests::RSpec::Runner.stub!(:run).with("bundle show rspec").and_return "/foo/bar/rspec-2.4.2"
 
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{rspec\s+ --color --tty -O spec/parallel_spec.opts}}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
     end
 
     it "uses options passed in" do
       ParallelTests::RSpec::Runner.should_receive(:open).with{|x,y| x =~ %r{rspec -f n}}.and_return mocked_process
-      call(['xxx'],1, :test_options => '-f n')
+      call(['xxx'],1,22, :test_options => '-f n')
     end
 
     it "returns the output" do
       io = open('spec/spec_helper.rb')
       $stdout.stub!(:print)
       ParallelTests::RSpec::Runner.should_receive(:open).and_return io
-      call(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
+      call(['xxx'],1,22,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 

data/spec/parallel_tests/test/runner_spec.rb

@@ -10,24 +10,31 @@ describe ParallelTests::Test::Runner do
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelTests::Test::Runner.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      call(['xxx'],0,{})
+      call(['xxx'],0,22,{})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelTests::Test::Runner.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      call(['xxx'],1,{})
+      call(['xxx'],1,22,{})
+    end
+
+    it 'sets PARALLEL_TEST_GROUPS so child processes know that they are being run under parallel_tests' do
+      ENV['PARALLEL_TEST_PROCESSORS'] = '22'
+      ParallelTests::Test::Runner.should_receive(:open).with{|x,y| x=~/PARALLEL_TEST_GROUPS=22/}.and_return mocked_process
+      call(['xxx'],1,22,{})
+      ENV.delete('PARALLEL_TEST_PROCESSORS')
     end
 
     it "uses options" do
       ParallelTests::Test::Runner.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest .* -- -v}}.and_return mocked_process
-      call(['xxx'],1,:test_options => '-v')
+      call(['xxx'],1,22,:test_options => '-v')
     end
 
     it "returns the output" do
       io = open('spec/spec_helper.rb')
       $stdout.stub!(:print)
       ParallelTests::Test::Runner.should_receive(:open).and_return io
-      call(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
+      call(['xxx'],1,22,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 

metadata

@@ -2,14 +2,14 @@
 name: parallel_tests
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3154313804102056863
+      hash: -1348773835990268798
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3154313804102056863
+      hash: -1348773835990268798
   none: false
 requirements: []
 rubyforge_project: