parallel_tests 0.7.0.alpha2 → 0.7.0.rc1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.7.0.alpha2)
+    parallel_tests (0.7.0.rc1)
       parallel
 
 GEM
@@ -18,7 +18,7 @@ GEM
     gherkin (2.7.6)
       json (>= 1.4.6)
     json (1.6.4)
-    parallel (0.5.1)
+    parallel (0.5.2)
     rake (0.8.7)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)

data/Readme.md

@@ -1,6 +1,8 @@
 Speedup Test::Unit + RSpec + Cucumber by running parallel on multiple CPUs (or cores).<br/>
 ParallelTests splits tests into even groups(by number of tests or runtime) and runs each group in a single process with its own database.
 
+[upgrading from 0.6 ?](https://github.com/grosser/parallel_tests/wiki/Upgrading-0.6.x-to-0.7.x)
+
 Setup for Rails
 ===============
 [still using Rails 2?](https://github.com/grosser/parallel_tests/blob/master/ReadmeRails2.md)
@@ -46,7 +48,7 @@ ParallelTests uses 1 database per test-process, 2 processes will use `*_test` an
 
 Test by pattern (e.g. use one integration server per subfolder / see if you broke any 'user'-related tests)
 
-    rake parallel:test[^unit] # everything in test/unit folder (every test file matching /^unit/)
+    rake parallel:test[^test/unit] # every test file in test/unit folder
     rake parallel:test[user]  # run users_controller + user_helper + user tests
     rake parallel:test['user|product']  # run user and product related tests
 
@@ -73,7 +75,7 @@ Rspec: Add to your `.rspec_parallel` (or `.rspec`) :
     RSpec
       If installed as plugin: -I vendor/plugins/parallel_tests/lib
       --format progress
-      --format ParallelTests::Spec::RuntimeLogger --out tmp/parallel_profile.log
+      --format ParallelTests::Spec::RuntimeLogger --out tmp/parallel_runtime_spec.log
 
 Test::Unit:  Add to your `test_helper.rb`:
 
@@ -168,7 +170,6 @@ TIPS
 TODO
 ====
  - document how to use cucumber runtime logger
- - unify runtime-log location
  - add tests for cucumber runtime formatter
  - make jRuby compatible [basics](http://yehudakatz.com/2009/07/01/new-rails-isolation-testing/)
  - make windows compatible

data/ReadmeRails2.md

@@ -19,13 +19,17 @@ OR as plugin
 
     ./script/plugin install git://github.com/grosser/parallel_tests.git
 
+    # add to Rakefile
+    begin; require 'vendor/plugins/parallel_tests/lib/parallel_tests/tasks'; rescue LoadError; end
+
+
 Even process runtimes
 -----------------
 
     RSpec 1.x:
       --format progress
       --require parallel_tests/spec/runtime_logger
-      --format ParallelTests::Spec::RuntimeLogger:tmp/parallel_profile.log
+      --format ParallelTests::Spec::RuntimeLogger:tmp/parallel_runtime_spec.log
 
 SpecSummaryLogger
 --------------------

data/lib/parallel_tests.rb

@@ -1,6 +1,7 @@
 require 'parallel'
 require 'parallel_tests/version'
 require 'parallel_tests/grouper'
+require 'parallel_tests/railtie' if defined? Rails::Railtie
 
 module ParallelTests
   def self.determine_number_of_processes(count)

data/lib/parallel_tests/cli.rb

@@ -5,7 +5,6 @@ module ParallelTest
   module CLI
     def self.run(argv)
       options = parse_options!(argv)
-      test_results = nil
 
       num_processes = ParallelTests.determine_number_of_processes(options[:count])
       num_processes = num_processes * (options[:multiply] || 1)
@@ -13,40 +12,61 @@ module ParallelTest
       if options[:execute]
         execute_shell_command_in_parallel(options[:execute], num_processes, options)
       else
-        lib = options[:type] || 'test'
-        require "parallel_tests/#{lib}/runner"
-        runner = eval("ParallelTests::#{lib.capitalize}::Runner")
-        name = runner.test_file_name
-
-        report_time_taken do
-          groups = runner.tests_in_groups(options[:files], num_processes, options)
-          abort "no #{name}s found!" if groups.size == 0
-
-          num_processes = groups.size
-          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"
-
-          test_results = Parallel.map(groups, :in_processes => num_processes) do |group|
-            if group.empty?
-              {:stdout => '', :exit_status => 0}
-            else
-              runner.run_tests(group, groups.index(group), options)
-            end
-          end
-
-          #parse and print results
-          results = runner.find_results(test_results.map { |result| result[:stdout] }*"")
-          puts ""
-          puts runner.summarize_results(results)
+        run_tests_in_parallel(num_processes, options)
+      end
+    end
+
+    private
+
+    def self.run_tests_in_parallel(num_processes, options)
+      test_results = nil
+      lib = options[:type] || 'test'
+      runner = load_runner_for(lib)
+
+      report_time_taken do
+        groups = runner.tests_in_groups(options[:files], num_processes, options)
+        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)
         end
 
-        #exit with correct status code so rake parallel:test && echo 123 works
-        failed = test_results.any? { |result| result[:exit_status] != 0 }
-        abort "#{lib.capitalize}s Failed" if failed
+        report_results runner, test_results
       end
+
+      abort "#{lib.capitalize}s Failed" if any_test_failed?(test_results)
     end
 
-    private
+    def self.run_tests(runner, group, process_number, options)
+      if group.empty?
+        {:stdout => '', :exit_status => 0}
+      else
+        runner.run_tests(group, process_number, options)
+      end
+    end
+
+    def self.report_results(runner, test_results)
+      results = runner.find_results(test_results.map { |result| result[:stdout] }*"")
+      puts ""
+      puts runner.summarize_results(results)
+    end
+
+    def self.report_number_of_tests(runner, groups)
+      name = runner.test_file_name
+      num_processes = groups.size
+      num_tests = groups.map(&:size).inject(:+)
+      puts "#{num_processes} processes for #{num_tests} #{name}s, ~ #{num_tests / groups.size} #{name}s per process"
+    end
+
+    #exit with correct status code so rake parallel:test && echo 123 works
+    def self.any_test_failed?(test_results)
+      test_results.any? { |result| result[:exit_status] != 0 }
+    end
+
+    def self.load_runner_for(lib)
+      require "parallel_tests/#{lib}/runner"
+      eval("ParallelTests::#{lib.capitalize}::Runner")
+    end
 
     def self.parse_options!(argv)
       options = {}
@@ -60,7 +80,7 @@ Run all tests in parallel, giving each process ENV['TEST_ENV_NUMBER'] ('', '2',
 Options are:
 BANNER
         opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: available CPUs") { |n| options[:count] = n }
-        opts.on("-p", '--pattern [PATTERN]', "run tests matching this pattern") { |pattern| options[:pattern] = pattern }
+        opts.on("-p", '--pattern [PATTERN]', "run tests matching this pattern") { |pattern| options[:pattern] = /#{pattern}/ }
         opts.on("--no-sort", "do not sort files before running them") { |no_sort| options[:no_sort] = no_sort }
         opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run") { |multiply| options[:multiply] = multiply }
         opts.on("-s [PATTERN]", "--single [PATTERN]", "Run all matching files in only one process") do |pattern|

data/lib/parallel_tests/railtie.rb

@@ -1,10 +1,8 @@
-# add rake tasks if we are inside Rails 3
-if defined?(Rails::Railtie)
-  module ParallelTests
-    class Railtie < ::Rails::Railtie
-      rake_tasks do
-        load File.expand_path("../tasks.rake", __FILE__)
-      end
+# rake tasks for Rails 3+
+module ParallelTests
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      require "parallel_tests/tasks"
     end
   end
 end

data/lib/parallel_tests/spec/runner.rb

@@ -22,9 +22,8 @@ module ParallelTests
         cmd or raise("Can't find executables rspec or spec")
       end
 
-      # legacy <-> people log to this file using rspec options
       def self.runtime_log
-        'tmp/parallel_profile.log'
+        'tmp/parallel_runtime_spec.log'
       end
 
       def self.test_file_name

data/lib/parallel_tests/tasks.rb

@@ -49,7 +49,7 @@ namespace :parallel do
       count, pattern, options = ParallelTests.parse_rake_args(args)
       test_type = (type == 'features' ? 'cucumber' : type)
       executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
-      command = "#{executable} '#{Rails.root}/#{type}' --type #{test_type} -n #{count} -p '#{pattern}' -o '#{options}'"
+      command = "#{executable} #{type} --type #{test_type} -n #{count} -p '#{pattern}' -o '#{options}'"
       abort unless system(command) # allow to chain tasks e.g. rake parallel:spec parallel:features
     end
   end

data/lib/parallel_tests/test/runner.rb

@@ -49,7 +49,7 @@ module ParallelTests
 
       def self.find_results(test_output)
         test_output.split("\n").map {|line|
-          line = line.gsub(/\.|F|\*/,'')
+          line = line.gsub(/\.|F|\*/,'').gsub(/\e\[\d+m/,'')
           next unless line_is_result?(line)
           line
         }.compact
@@ -121,20 +121,18 @@ module ParallelTests
       def self.find_tests(tests, options={})
         (tests||[]).map do |file_or_folder|
           if File.directory?(file_or_folder)
-            tests_in_folder(file_or_folder, options)
+            files = files_in_folder(file_or_folder)
+            files.grep(/#{Regexp.escape test_suffix}$/).grep(options[:pattern]||//)
           else
             file_or_folder
           end
         end.flatten.uniq
       end
 
-      def self.tests_in_folder(folder, options)
+      def self.files_in_folder(folder)
         # follow one symlink and direct children
         # http://stackoverflow.com/questions/357754/can-i-traverse-symlinked-directories-in-ruby-with-a-glob
-        files = Dir["#{folder}/**{,/*/**}/*#{test_suffix}"].uniq
-        files = files.map{|f| f.sub(folder+'/','') }
-        files = files.grep(/#{options[:pattern]}/)
-        files.map{|f| "#{folder}/#{f}" }
+        Dir[File.join(folder, "**{,/*/**}/*")].uniq
       end
     end
   end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.7.0.alpha2'
+  VERSION = Version = '0.7.0.rc1'
 end

data/spec/integration_spec.rb

@@ -143,6 +143,16 @@ describe 'CLI' do
     result.scan(/ENV-.?-/).should =~ ["ENV--", "ENV-2-", "ENV-3-", "ENV-4-", "ENV-5-"]
   end
 
+  it "filters test by given pattern and relative paths" do
+    write "spec/x_spec.rb", "puts 'XXX'"
+    write "spec/y_spec.rb", "puts 'YYY'"
+    write "spec/z_spec.rb", "puts 'ZZZ'"
+    result = run_tests("spec", :add => '-p "^spec/(x|z)"')
+    result.should include('XXX')
+    result.should_not include('YYY')
+    result.should include('ZZZ')
+  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/test/runner_spec.rb

@@ -97,6 +97,13 @@ EOF
 
       call(output).should == ['10 tests, 20 assertions, 0 failures, 0 errors','14 tedsts, 20 assertions, 0 failures, 0 errors']
     end
+
+    it "ignores color-codes" do
+      output = <<EOF
+10 tests, 20 assertions, 0 \e[31mfailures, 0 errors
+EOF
+      call(output).should == ['10 tests, 20 assertions, 0 failures, 0 errors']
+    end
   end
 
   describe :find_tests do
@@ -104,45 +111,90 @@ EOF
       ParallelTests::Test::Runner.send(:find_tests, *args)
     end
 
-    it "finds test files nested in folders" do
+    def with_files(files)
       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/`
-        call([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"
-        ]
+        files.each do |file|
+          parent = "#{root}/#{File.dirname(file)}"
+          `mkdir -p #{parent}` unless File.exist?(parent)
+          `touch #{root}/#{file}`
+        end
+        yield root
       ensure
         `rm -rf #{root}`
       end
     end
 
-    it "finds test files in folders 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`
-        call([root], :pattern => '^a/(y|z)_test').sort.should == [
-          "#{root}/a/y_test.rb",
-            "#{root}/a/z_test.rb",
+    def inside_dir(dir)
+      old = Dir.pwd
+      Dir.chdir dir
+      yield
+    ensure
+      Dir.chdir old
+    end
+
+    it "finds test in folders with appended /" do
+      with_files(['b/a_test.rb']) do |root|
+        call(["#{root}/"]).sort.should == [
+          "#{root}/b/a_test.rb",
         ]
-      ensure
-        `rm -rf #{root}`
+      end
+    end
+
+    it "finds test files nested in symlinked folders" do
+      with_files(['a/a_test.rb','b/b_test.rb']) do |root|
+        `ln -s #{root}/a #{root}/b/link`
+        call(["#{root}/b"]).sort.should == [
+          "#{root}/b/b_test.rb",
+          "#{root}/b/link/a_test.rb",
+        ]
+      end
+    end
+
+    it "finds test files nested in different folders" do
+      with_files(['a/a_test.rb','b/b_test.rb', 'c/c_test.rb']) do |root|
+        call(["#{root}/a", "#{root}/b"]).sort.should == [
+          "#{root}/a/a_test.rb",
+          "#{root}/b/b_test.rb",
+        ]
+      end
+    end
+
+    it "only finds tests in folders" do
+      with_files(['a/a_test.rb', 'a/test.rb', 'a/test_helper.rb']) do |root|
+        call(["#{root}/a"]).sort.should == [
+          "#{root}/a/a_test.rb"
+        ]
+      end
+    end
+
+    it "finds tests in nested folders" do
+      with_files(['a/b/c/d/a_test.rb']) do |root|
+        call(["#{root}/a"]).sort.should == [
+          "#{root}/a/b/c/d/a_test.rb"
+        ]
+      end
+    end
+
+    it "does not expand paths" do
+      with_files(['a/x_test.rb']) do |root|
+        inside_dir root do
+          call(['a']).sort.should == [
+            "a/x_test.rb"
+          ]
+        end
+      end
+    end
+
+    it "finds test files in folders by pattern" do
+      with_files(['a/x_test.rb','a/y_test.rb','a/z_test.rb']) do |root|
+        inside_dir root do
+          call(["a"], :pattern => /^a\/(y|z)_test/).sort.should == [
+            "a/y_test.rb",
+            "a/z_test.rb",
+          ]
+        end
       end
     end
 

metadata

@@ -1,36 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: parallel_tests
-version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha2
+version: !ruby/object:Gem::Version 
+  hash: 161060265
   prerelease: 6
+  segments: 
+  - 0
+  - 7
+  - 0
+  - rc
+  - 1
+  version: 0.7.0.rc1
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: &16386080 !ruby/object:Gem::Requirement
+
+date: 2012-02-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *16386080
+  requirement: *id001
+  type: :runtime
+  name: parallel
 description: 
 email: michael@grosser.it
-executables:
+executables: 
 - parallel_cucumber
 - parallel_spec
 - parallel_test
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -67,31 +80,39 @@ files:
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/parallel_tests
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -3495402516497603622
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Run Test::Unit / RSpec / Cucumber in parallel
 test_files: []
+