moxiesoft_parallel_tests 0.4.13 → 0.6.18

data/spec/parallel_tests_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ParallelTests do
   test_tests_in_groups(ParallelTests, 'test', '_test.rb')
@@ -14,38 +14,49 @@ describe ParallelTests do
       ParallelTests.parse_rake_args(args).should == [Parallel.processor_count, "models", ""]
     end
 
-    it "should return the count and prefix" do
-      args = {:count => 2, :path_prefix => "models"}
+    it "should return the count and pattern" do
+      args = {:count => 2, :pattern => "models"}
       ParallelTests.parse_rake_args(args).should == [2, "models", ""]
     end
 
-    it "should return the count, prefix, and options" do
-      args = {:count => 2, :path_prefix => "plain", :options => "-p default" }
+    it "should return the count, pattern, and options" do
+      args = {:count => 2, :pattern => "plain", :options => "-p default" }
       ParallelTests.parse_rake_args(args).should == [2, "plain", "-p default"]
     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, '', '']
+    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, '', ""]
+    end
   end
 
   describe :run_tests do
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
       ParallelTests.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],0,'')
+      ParallelTests.run_tests(['xxx'],0,{})
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
       ParallelTests.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],1,'')
+      ParallelTests.run_tests(['xxx'],1,{})
     end
 
     it "uses options" do
-      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest -v}}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],1,'-v')
+      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest .* -- -v}}.and_return mocked_process
+      ParallelTests.run_tests(['xxx'],1,:test_options => '-v')
     end
 
     it "returns the output" do
       io = open('spec/spec_helper.rb')
       ParallelTests.stub!(:print)
       ParallelTests.should_receive(:open).and_return io
-      ParallelTests.run_tests(['xxx'],1,'')[:stdout].should =~ /\$LOAD_PATH << File/
+      ParallelTests.run_tests(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
   end
 
@@ -57,9 +68,15 @@ describe ParallelTests do
 
     it "does sort when not passed do_sort option" do
       ParallelTests.stub!(:tests_with_runtime).and_return([])
-      ParallelTests::Grouper.should_receive(:smallest_first).and_return([])
+      ParallelTests::Grouper.should_receive(:largest_first).and_return([])
       ParallelTests.tests_in_groups [], 1
     end
+
+    it "groups by single_process pattern and then via size" do
+      ParallelTests.should_receive(:with_runtime_info).and_return([['aaa',5],['aaa2',5],['bbb',2],['ccc',1],['ddd',1]])
+      result = ParallelTests.tests_in_groups [], 3, :single_process => [/^a.a/]
+      result.should == [["aaa", "aaa2"], ["bbb"], ["ccc", "ddd"]]
+    end
   end
 
   describe :find_results do
@@ -83,7 +100,7 @@ EOF
       ParallelTests.find_results(output).should == ['10 tests, 20 assertions, 0 failures, 0 errors','14 tests, 20 assertions, 0 failures, 0 errors']
     end
 
-    it "is robust against scrambeled output" do
+    it "is robust against scrambled output" do
       output = <<EOF
 Loaded suite /opt/ruby-enterprise/lib/ruby/gems/1.8/gems/rake-0.8.4/lib/rake/rake_test_loader
 Started
@@ -136,7 +153,77 @@ EOF
     end
   end
 
+  describe :find_tests do
+    it "returns if root is an array" do
+      ParallelTests.send(:find_tests, [1]).should == [1]
+    end
+
+    it "finds all test files" do
+      begin
+        root = "/tmp/test-find_tests-#{rand(999)}"
+        `mkdir #{root}`
+        `mkdir #{root}/a`
+        `mkdir #{root}/b`
+        `touch #{root}/x_test.rb`
+        `touch #{root}/a/x_test.rb`
+        `touch #{root}/a/test.rb`
+        `touch #{root}/b/y_test.rb`
+        `touch #{root}/b/test.rb`
+        `ln -s #{root}/b #{root}/c`
+        `ln -s #{root}/b #{root}/a/`
+        ParallelTests.send(:find_tests, root).sort.should == [
+          "#{root}/a/b/y_test.rb",
+          "#{root}/a/x_test.rb",
+          "#{root}/b/y_test.rb",
+          "#{root}/c/y_test.rb",
+          "#{root}/x_test.rb"
+        ]
+      ensure
+        `rm -rf #{root}`
+      end
+    end
+
+    it "finds files by pattern" do
+      begin
+        root = "/tmp/test-find_tests-#{rand(999)}"
+        `mkdir #{root}`
+        `mkdir #{root}/a`
+        `touch #{root}/a/x_test.rb`
+        `touch #{root}/a/y_test.rb`
+        `touch #{root}/a/z_test.rb`
+        ParallelTests.send(:find_tests, root, :pattern => '^a/(y|z)_test').sort.should == [
+          "#{root}/a/y_test.rb",
+          "#{root}/a/z_test.rb",
+        ]
+      ensure
+        `rm -rf #{root}`
+      end
+    end
+  end
+
+  describe :summarize_results do
+    it "adds results" do
+      ParallelTests.summarize_results(['1 foo 3 bar','2 foo 5 bar']).should == '8 bars, 3 foos'
+    end
+
+    it "adds results with braces" do
+      ParallelTests.summarize_results(['1 foo(s) 3 bar(s)','2 foo 5 bar']).should == '8 bars, 3 foos'
+    end
+
+    it "adds same results with plurals" do
+      ParallelTests.summarize_results(['1 foo 3 bar','2 foos 5 bar']).should == '8 bars, 3 foos'
+    end
+
+    it "adds non-similar results" do
+      ParallelTests.summarize_results(['1 xxx 2 yyy','1 xxx 2 zzz']).should == '2 xxxs, 2 yyys, 2 zzzs'
+    end
+
+    it "does not pluralize 1" do
+      ParallelTests.summarize_results(['1 xxx 2 yyy']).should == '1 xxx, 2 yyys'
+    end
+  end
+
   it "has a version" do
     ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
-end
+end

data/spec/spec_helper.rb

@@ -4,8 +4,19 @@ require 'rubygems'
 
 FAKE_RAILS_ROOT = '/tmp/pspecs/fixtures'
 
+require 'tempfile'
 require 'parallel_specs'
+require 'parallel_specs/spec_runtime_logger'
+require 'parallel_specs/spec_summary_logger'
 require 'parallel_cucumber'
+require 'parallel_tests/runtime_logger'
+
+OutputLogger = Struct.new(:output) do
+  attr_reader :flock, :flush
+  def puts(s=nil)
+    self.output << s.to_s
+  end
+end
 
 def mocked_process
   open('|cat /dev/null')
@@ -25,7 +36,7 @@ def use_temporary_directory_for
 
   begin
     # just in case the temporary dir already exists
-    FileUtils.rm_rf(dir) if File.exists?(dir) 
+    FileUtils.rm_rf(dir) if File.exists?(dir)
 
     # create the temporary directory
     FileUtils.mkdir_p(new_dir)
@@ -53,14 +64,18 @@ def test_tests_in_groups(klass, folder, suffix)
         file
       end
 
-      @log = "#{FAKE_RAILS_ROOT}/tmp/parallel_profile.log"
-      `mkdir #{File.dirname(@log)}`
+      @log = klass.runtime_log
+      `mkdir -p #{File.dirname(@log)}`
       `rm -f #{@log}`
     end
 
+    after :all do
+      `rm -f #{klass.runtime_log}`
+    end
+
     it "groups when given an array of files" do
       list_of_files = Dir["#{test_root}/**/*#{suffix}"]
-      found = klass.tests_with_runtime(list_of_files)
+      found = klass.with_runtime_info(list_of_files)
       found.should =~ list_of_files.map{ |file| [file, File.stat(file).size]}
     end
 
@@ -85,18 +100,34 @@ def test_tests_in_groups(klass, folder, suffix)
       groups.map{|g| size_of(g)}.should =~ [300, 300, 200]
     end
 
-    it "partitions by runtime when runtime-data is available" do
+    def setup_runtime_log
       File.open(@log,'w') do |f|
         @files[1..-1].each{|file| f.puts "#{file}:#{@files.index(file)}"}
         f.puts "#{@files[0]}:10"
       end
+    end
+
+    it "partitions by runtime when runtime-data is available" do
+      klass.stub!(:puts)
+      setup_runtime_log
 
       groups = klass.tests_in_groups(test_root, 2)
       groups.size.should == 2
-      # 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]]
+      # 10 + 1 + 3 + 5 = 19
+      groups[0].should == [@files[0],@files[1],@files[3],@files[5]]
+      # 2 + 4 + 6 + 7 = 19
+      groups[1].should == [@files[2],@files[4],@files[6],@files[7]]
+    end
+
+    it "alpha-sorts partitions when runtime-data is available" do
+      klass.stub!(:puts)
+      setup_runtime_log
+
+      groups = klass.tests_in_groups(test_root, 2)
+      groups.size.should == 2
+
+      groups[0].should == groups[0].sort
+      groups[1].should == groups[1].sort
     end
 
     it "partitions by round-robin when not sorting" do
@@ -106,5 +137,13 @@ def test_tests_in_groups(klass, folder, suffix)
       groups[0].should == ["file1.rb", "file3.rb"]
       groups[1].should == ["file2.rb", "file4.rb"]
     end
+
+    it "alpha-sorts partitions when not sorting by runtime" do
+      files = %w[q w e r t y u i o p a s d f g h j k l z x c v b n m]
+      klass.should_receive(:find_tests).and_return(files)
+      groups = klass.tests_in_groups(files, 2, :no_sort => true)
+      groups[0].should == groups[0].sort
+      groups[1].should == groups[1].sort
+    end
   end
 end

metadata

@@ -1,41 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: moxiesoft_parallel_tests
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.18
   prerelease: 
-  version: 0.4.13
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 - Erik DeBill
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-06 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-04-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152337800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *2152337800
 description: 
 email: grosser.michael@gmail.com
-executables: 
+executables:
 - parallel_cucumber
 - parallel_spec
 - parallel_test
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -53,44 +49,38 @@ files:
 - lib/parallel_tests/railtie.rb
 - lib/parallel_tests/tasks.rb
 - lib/tasks/parallel_tests.rake
-- moxiesoft_parallel_tests.gemspec
+- parallel_tests.gemspec
 - spec/integration_spec.rb
 - spec/parallel_cucumber_spec.rb
 - spec/parallel_specs_spec.rb
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/edebill-moxiesoft/moxiesoft_parallel_tests
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4444091468267362963
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Run tests / specs / features in parallel
-test_files: 
+test_files:
 - spec/integration_spec.rb
 - spec/parallel_cucumber_spec.rb
 - spec/parallel_specs_spec.rb

data/moxiesoft_parallel_tests.gemspec

@@ -1,65 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{moxiesoft_parallel_tests}
-  s.version = "0.4.13"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Grosser", "Erik DeBill"]
-  s.date = %q{2011-10-06}
-  s.email = %q{grosser.michael@gmail.com}
-  s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "Rakefile",
-     "Readme.md",
-     "VERSION",
-     "bin/parallel_cucumber",
-     "bin/parallel_spec",
-     "bin/parallel_test",
-     "lib/parallel_cucumber.rb",
-     "lib/parallel_specs.rb",
-     "lib/parallel_specs/spec_runtime_logger.rb",
-     "lib/parallel_tests.rb",
-     "lib/parallel_tests/grouper.rb",
-     "lib/parallel_tests/railtie.rb",
-     "lib/parallel_tests/tasks.rb",
-     "lib/tasks/parallel_tests.rake",
-     "moxiesoft_parallel_tests.gemspec",
-     "spec/integration_spec.rb",
-     "spec/parallel_cucumber_spec.rb",
-     "spec/parallel_specs_spec.rb",
-     "spec/parallel_tests_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/edebill-moxiesoft/moxiesoft_parallel_tests}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{Run tests / specs / features in parallel}
-  s.test_files = [
-    "spec/integration_spec.rb",
-     "spec/parallel_cucumber_spec.rb",
-     "spec/parallel_specs_spec.rb",
-     "spec/parallel_tests_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<parallel>, [">= 0"])
-    else
-      s.add_dependency(%q<parallel>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<parallel>, [">= 0"])
-  end
-end
-