parallel_tests 0.6.19 → 0.6.20

data/VERSION

@@ -1 +1 @@
-0.6.19
+0.6.20

data/bin/parallel_test

@@ -39,7 +39,7 @@ raise "--no-sort and --single-process are not supported" if options[:no_sort] an
 # get files to run from arguments
 options[:files] = ARGV if ARGV.size > 0
 
-num_processes = options[:count] || Parallel.processor_count
+num_processes = ParallelTests.determine_number_of_processes(options[:count])
 num_processes = num_processes * (options[:multiply] || 1)
 
 if options[:execute]

data/lib/parallel_tests.rb

@@ -5,6 +5,14 @@ require 'parallel_tests/railtie'
 class ParallelTests
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 
+  def self.determine_number_of_processes(count)
+    [
+      count,
+      ENV['PARALLEL_TEST_PROCESSORS'],
+      Parallel.processor_count
+    ].detect{|c| not c.to_s.strip.empty? }.to_i
+  end
+
   # parallel:spec[:count, :pattern, :options]
   def self.parse_rake_args(args)
     # order as given by user
@@ -15,13 +23,10 @@ class ParallelTests
     # parallel:spec[,models,options]
     count = args.shift if args.first.to_s =~ /^\d*$/
     num_processes = count.to_i unless count.to_s.empty?
-    num_processes ||= ENV['PARALLEL_TEST_PROCESSORS'].to_i if ENV['PARALLEL_TEST_PROCESSORS']
-    num_processes ||= Parallel.processor_count
-
     pattern = args.shift
     options = args.shift
 
-    [num_processes.to_i, pattern.to_s, options.to_s]
+    [num_processes, pattern.to_s, options.to_s]
   end
 
   # finds all tests and partitions them into groups

data/lib/parallel_tests/tasks.rb

@@ -1,8 +1,8 @@
 namespace :parallel do
   def run_in_parallel(cmd, options)
-    count = (options[:count] ? options[:count].to_i : nil)
+    count = "-n #{options[:count]}" if options[:count]
     executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
-    command = "#{executable} --exec '#{cmd}' -n #{count} #{'--non-parallel' if options[:non_parallel]}"
+    command = "#{executable} --exec '#{cmd}' #{count} #{'--non-parallel' if options[:non_parallel]}"
     abort unless system(command)
   end
 

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parallel_tests"
-  s.version = "0.6.19"
+  s.version = "0.6.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-02-17"
+  s.date = "2012-02-24"
   s.email = "grosser.michael@gmail.com"
   s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
   s.files = [
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/grosser/parallel_tests"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Run tests / specs / features in parallel"
 
   if s.respond_to? :specification_version then

data/spec/integration_spec.rb

@@ -29,7 +29,8 @@ describe 'CLI' do
   end
 
   def run_tests(options={})
-    `cd #{folder} && #{executable} --chunk-timeout 999 -t #{options[:type] || 'spec'} -n #{options[:processes]||2} #{options[:add]} 2>&1`
+    processes = "-n #{options[:processes]||2}" unless options[:processes] == false
+    `cd #{folder} && #{options[:export]} #{executable} --chunk-timeout 999 -t #{options[:type] || 'spec'} #{processes} #{options[:add]} 2>&1`
   end
 
   it "runs tests in parallel" do
@@ -85,9 +86,13 @@ describe 'CLI' do
     system("#{executable} -e 'test -e xxxx' -n 4").should == false
   end
 
-  it "can run through parallel_spec / parallel_cucumber" do
+  it "can run through parallel_spec" do
     version = `#{executable} -v`
     `#{bin_folder}/parallel_spec -v`.should == version
+  end
+
+  it "can run through parallel_spec" do
+    version = `#{executable} -v`
     `#{bin_folder}/parallel_cucumber -v`.should == version
   end
 
@@ -101,7 +106,7 @@ describe 'CLI' do
     (Time.now - t).should <= expected
   end
 
-  it "can can with given files" do
+  it "can run with given files" do
     write "spec/x1_spec.rb", "puts '111'"
     write "spec/x2_spec.rb", "puts '222'"
     write "spec/x3_spec.rb", "puts '333'"
@@ -118,6 +123,15 @@ describe 'CLI' do
     result.should =~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/m # prints version twice
   end
 
+  it "runs with PARALLEL_TEST_PROCESSORS processes" do
+    processes = 5
+    processes.times{|i|
+      write "spec/x#{i}_spec.rb", "puts %{ENV-\#{ENV['TEST_ENV_NUMBER']}-}"
+    }
+    result = run_tests(:export => "PARALLEL_TEST_PROCESSORS=#{processes}", :processes => processes)
+    result.scan(/ENV-.?-/).should =~ ["ENV--", "ENV-2-", "ENV-3-", "ENV-4-", "ENV-5-"]
+  end
+
   context "Test::Unit" do
     it "runs" do
       write "test/x1_test.rb", "require 'test/unit'; class XTest < Test::Unit::TestCase; def test_xxx; end; end"

data/spec/parallel_tests_spec.rb

@@ -11,7 +11,7 @@ describe ParallelTests do
 
     it "should default to the prefix" do
       args = {:count => "models"}
-      ParallelTests.parse_rake_args(args).should == [Parallel.processor_count, "models", ""]
+      ParallelTests.parse_rake_args(args).should == [nil, "models", ""]
     end
 
     it "should return the count and pattern" do
@@ -23,16 +23,38 @@ describe ParallelTests do
       args = {:count => 2, :pattern => "plain", :options => "-p default" }
       ParallelTests.parse_rake_args(args).should == [2, "plain", "-p default"]
     end
+  end
 
-    it "should use the PARALLEL_TEST_PROCESSORS env var for processor_count if set" do
-      ENV['PARALLEL_TEST_PROCESSORS'] = '28'
-      ParallelTests.parse_rake_args({}).should == [28, '', '']
+  describe ".determine_number_of_processes" do
+    before do
+      ENV.delete('PARALLEL_TEST_PROCESSORS')
+      Parallel.stub(:processor_count).and_return 20
     end
 
-    it "should use count over PARALLEL_TEST_PROCESSORS env var" do
-      ENV['PARALLEL_TEST_PROCESSORS'] = '28'
-      args = {:count => 2}
-      ParallelTests.parse_rake_args(args).should == [2, '', ""]
+    def call(count)
+      ParallelTests.determine_number_of_processes(count)
+    end
+
+    it "uses the given count if set" do
+      call('5').should == 5
+    end
+
+    it "uses the processor count from Parallel" do
+      call(nil).should == 20
+    end
+
+    it "uses the processor count from ENV before Parallel" do
+      ENV['PARALLEL_TEST_PROCESSORS'] = '22'
+      call(nil).should == 22
+    end
+
+    it "does not use blank count" do
+      call('   ').should == 20
+    end
+
+    it "does not use blank env" do
+      ENV['PARALLEL_TEST_PROCESSORS'] = '   '
+      call(nil).should == 20
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000 Z
+date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &84626410 !ruby/object:Gem::Requirement
+  requirement: &12086720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84626410
+  version_requirements: *12086720
 description: 
 email: grosser.michael@gmail.com
 executables:
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -373433901
+      hash: -3131334744826676279
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Run tests / specs / features in parallel