parallel_tests 0.3.3 → 0.3.4

data/README.markdown

@@ -107,6 +107,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Charles Finkel](http://charlesfinkel.com/)
  - [Jason Morrison](http://jayunit.net)
  - [Joakim Kolsjö](http://www.rubyblocks.se)
+ - [Kevin Scaldeferri](http://kevin.scaldeferri.com/blog/)
  - [Kpumuk](http://kpumuk.info/)
  - [Maksim Horbu](http://github.com/mhorbul)
  - [Rohan Deshpande](http://github.com/rdeshpande)

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/parallel_cucumber.rb

@@ -2,8 +2,8 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 
 class ParallelCucumber < ParallelTests
   def self.run_tests(test_files, process_number, options)
-    color = ($stdout.tty? ? 'export AUTOTEST=1 ;' : '')#display color when we are in a terminal
-    cmd = "export RAILS_ENV=test ; #{color} #{executable} #{options} #{test_files*' '}"
+    color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
+    cmd = "RAILS_ENV=test ; export RAILS_ENV ; #{color} #{executable} #{options} #{test_files*' '}"
     execute_command(cmd, process_number)
   end
 
@@ -22,7 +22,7 @@ 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

data/lib/parallel_specs.rb

@@ -4,8 +4,8 @@ class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
     spec_opts = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
     spec_opts = (spec_opts ? "-O #{spec_opts}" : nil)
-    color = ($stdout.tty? ? 'export RSPEC_COLOR=1 ;' : '')#display color when we are in a terminal
-    cmd = "export RAILS_ENV=test ; #{color} #{executable} #{options} #{spec_opts} #{test_files*' '}"
+    color = ($stdout.tty? ? 'RSPEC_COLOR=1 ; export RSPEC_COLOR ;' : '')#display color when we are in a terminal
+    cmd = "RAILS_ENV=test ; export RAILS_ENV ; #{color} #{executable} #{options} #{spec_opts} #{test_files*' '}"
     execute_command(cmd, process_number)
   end
 

data/lib/parallel_tests.rb

@@ -21,30 +21,25 @@ class ParallelTests
   def self.tests_in_groups(root, num)
     tests_with_sizes = slow_specs_first(find_tests_with_sizes(root))
 
-    groups = []
-    current_group = current_size = 0
+    # always add to smallest group
+    groups = Array.new(num){{:tests => [], :size => 0}}
     tests_with_sizes.each do |test, size|
-      # inserts into next group if current is full and we are not in the last group
-      if (0.5*size + current_size) > group_size(tests_with_sizes, num) and num > current_group + 1
-        current_size = size
-        current_group += 1
-      else
-        current_size += size
-      end
-      groups[current_group] ||= []
-      groups[current_group] << test
+      smallest = groups.sort_by{|g| g[:size] }.first
+      smallest[:tests] << test
+      smallest[:size] += size
     end
-    groups.compact
+
+    groups.map{|g| g[:tests] }
   end
 
   def self.run_tests(test_files, process_number, options)
     require_list = test_files.map { |filename| "\"#{filename}\"" }.join(",")
-    cmd = "export RAILS_ENV=test ; ruby -Itest #{options} -e '[#{require_list}].each {|f| require f }'"
+    cmd = "RAILS_ENV=test ; export RAILS_ENV ; ruby -Itest #{options} -e '[#{require_list}].each {|f| require f }'"
     execute_command(cmd, process_number)
   end
 
   def self.execute_command(cmd, process_number)
-    cmd = "export TEST_ENV_NUMBER=#{test_env_number(process_number)} ; #{cmd}"
+    cmd = "TEST_ENV_NUMBER=#{test_env_number(process_number)} ; export TEST_ENV_NUMBER; #{cmd}"
     f = open("|#{cmd}", 'r')
     all = ''
     while char = f.getc
@@ -78,11 +73,11 @@ class ParallelTests
   def self.slow_specs_first(tests)
     tests.sort_by{|test, size| size }.reverse
   end
-  
+
   def self.line_is_result?(line)
     line =~ /\d+ failure/
   end
-  
+
   def self.line_is_failure?(line)
     line =~ /(\d{2,}|[1-9]) (failure|error)/
   end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-03-27}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_test", "parallel_spec", "parallel_cucumber"]
   s.extra_rdoc_files = [

data/spec/spec_helper.rb

@@ -38,26 +38,17 @@ def test_tests_in_groups(klass, folder, suffix)
 
     it "partitions them into groups by equal size" do
       groups = klass.tests_in_groups(test_root, 2)
-      groups.size.should == 2
-      size_of(groups[0]).should == 400
-      size_of(groups[1]).should == 400
+      groups.map{|g| size_of(g)}.should == [400, 400]
     end
 
     it 'should partition correctly with a group size of 4' do
       groups = klass.tests_in_groups(test_root, 4)
-      groups.size.should == 4
-      size_of(groups[0]).should == 200
-      size_of(groups[1]).should == 200
-      size_of(groups[2]).should == 200
-      size_of(groups[3]).should == 200
+      groups.map{|g| size_of(g)}.should == [200, 200, 200, 200]
     end
 
     it 'should partition correctly with an uneven group size' do
       groups = klass.tests_in_groups(test_root, 3)
-      groups.size.should == 3
-      size_of(groups[0]).should == 300
-      size_of(groups[1]).should == 300
-      size_of(groups[2]).should == 200
+      groups.map{|g| size_of(g)}.should =~ [300, 300, 200]
     end
 
     it "partitions by runtime when runtime-data is available" do
@@ -68,11 +59,10 @@ def test_tests_in_groups(klass, folder, suffix)
 
       groups = klass.tests_in_groups(test_root, 2)
       groups.size.should == 2
-      # 10 + 7 = 17
-      groups[0].should == [@files[0],@files[7]]
-      # 6+5+4+3+2+1 = 21
-      # still room for optimization...
-      groups[1].should == [@files[6],@files[5],@files[4],@files[3],@files[2],@files[1]]
+      # 10 + 5 + 3 + 1 = 19
+      groups[0].should == [@files[0],@files[5],@files[3],@files[1]]
+      # 7 + 6 + 4 + 2 = 19
+      groups[1].should == [@files[7],@files[6],@files[4],@files[2]]
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +01:00
+date: 2010-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency