parallel_tests 0.10.2 → 0.10.3

data/Gemfile

@@ -1,8 +1,8 @@
-source 'https://rubygems.org' 
+source 'https://rubygems.org'
 gemspec
 
 gem 'bump'
-gem 'test-unit', :platform => :ruby_19
+gem 'test-unit'
 gem 'rspec', '>=2.4'
 gem 'cucumber'
 gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.10.2)
+    parallel_tests (0.10.3)
       parallel
 
 GEM
@@ -19,7 +19,7 @@ GEM
     gherkin (2.7.6)
       json (>= 1.4.6)
     json (1.7.5)
-    parallel (0.6.2)
+    parallel (0.6.3)
     rake (10.0.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)

data/Readme.md

@@ -165,6 +165,7 @@ Options are:
     -e, --exec [COMMAND]             execute this code parallel and with ENV['TEST_ENV_NUM']
     -o, --test-options '[OPTIONS]'   execute test commands with those options
     -t, --type [TYPE]                test(default) / rspec / cucumber
+        --serialize-stdout           Serialize stdout output, nothing will be written until everything is done
         --non-parallel               execute same commands but do not in parallel, needs --exec
         --no-symlinks                Do not traverse symbolic links to find test files
         --ignore-tags [PATTERN]      When counting steps ignore scenarios with tags that match this pattern
@@ -259,6 +260,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Joseph Shraibman](https://github.com/jshraibman-mdsol)
  - [David Davis](https://github.com/daviddavis)
  - [Ari Pollak](https://github.com/aripollak)
+ - [Aaron Jensen](https://github.com/aaronjensen)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cli.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'tempfile'
 
 module ParallelTests
   class CLI
@@ -17,6 +18,16 @@ module ParallelTests
 
     private
 
+    def execute_in_parallel(items, num_processes, options)
+      Tempfile.open 'parallel_tests-lock' do |lock|
+        return Parallel.map(items, :in_processes => num_processes) do |item|
+          result = yield(item)
+          report_output(result, lock) if options[:serialize_stdout]
+          result
+        end
+      end
+    end
+
     def run_tests_in_parallel(num_processes, options)
       test_results = nil
 
@@ -24,7 +35,7 @@ module ParallelTests
         groups = @runner.tests_in_groups(options[:files], num_processes, options)
         report_number_of_tests(groups)
 
-        test_results = Parallel.map(groups, :in_processes => groups.size) do |group|
+        test_results = execute_in_parallel(groups, groups.size, options) do |group|
           run_tests(group, groups.index(group), num_processes, options)
         end
 
@@ -42,6 +53,14 @@ module ParallelTests
       end
     end
 
+    def report_output(result, lock)
+      lock.flock File::LOCK_EX
+      $stdout.puts result[:stdout]
+      $stdout.flush
+    ensure
+      lock.flock File::LOCK_UN
+    end
+
     def report_results(test_results)
       results = @runner.find_results(test_results.map { |result| result[:stdout] }*"")
       puts ""
@@ -105,6 +124,7 @@ TEXT
             abort
           end
         end
+        opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
         opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
         opts.on("--no-symlinks", "Do not traverse symbolic links to find test files") { options[:symlinks] = false }
         opts.on('--ignore-tags [PATTERN]', 'When counting steps ignore scenarios with tags that match this pattern')  { |arg| options[:ignore_tag_pattern] = arg }
@@ -133,11 +153,11 @@ TEXT
       runs = (0...num_processes).to_a
       results = if options[:non_parallel]
         runs.map do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, num_processes)
+          ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
         end
       else
-        Parallel.map(runs, :in_processes => num_processes) do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, num_processes)
+        execute_in_parallel(runs, num_processes, options) do |i|
+          ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
         end
       end.flatten
 

data/lib/parallel_tests/cucumber/runner.rb

@@ -15,7 +15,7 @@ module ParallelTests
           cucumber_opts(options[:test_options]),
           *test_files
         ].compact.join(" ")
-        execute_command(cmd, process_number, num_processes)
+        execute_command(cmd, process_number, num_processes, options)
       end
 
       def self.executable

data/lib/parallel_tests/rspec/runner.rb

@@ -9,7 +9,7 @@ module ParallelTests
         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, num_processes)
+        execute_command(cmd, process_number, num_processes, options)
       end
 
       def self.executable

data/lib/parallel_tests/test/runner.rb

@@ -24,7 +24,7 @@ module ParallelTests
       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, num_processes)
+        execute_command(cmd, process_number, num_processes, options)
       end
 
       def self.line_is_result?(line)
@@ -45,11 +45,11 @@ module ParallelTests
         Grouper.in_even_groups_by_size(tests, num_groups, options)
       end
 
-      def self.execute_command(cmd, process_number,  num_processes)
+      def self.execute_command(cmd, process_number,  num_processes, options)
         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)
+        output = fetch_output(f, options)
         f.close
         {:stdout => output, :exit_status => $?.exitstatus}
       end
@@ -85,12 +85,14 @@ module ParallelTests
       end
 
       # read output of the process and print it in chunks
-      def self.fetch_output(process)
+      def self.fetch_output(process, options)
         all = ''
         while buffer = process.readpartial(1000000)
           all << buffer
-          $stdout.print buffer
-          $stdout.flush
+          unless options[:serialize_stdout]
+            $stdout.print buffer
+            $stdout.flush
+          end
         end rescue EOFError
 
         all

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.10.2'
+  VERSION = Version = '0.10.3'
 end

data/spec/integration_spec.rb

@@ -78,6 +78,15 @@ describe 'CLI' do
     result.scan('2 examples, 1 failure').size.should == 1
   end
 
+  it "can serialize stdout" do
+    write 'spec/xxx_spec.rb', '5.times{describe("it"){it("should"){sleep 0.01; puts "TEST1"}}}'
+    write 'spec/xxx2_spec.rb', 'sleep 0.01; 5.times{describe("it"){it("should"){sleep 0.01; puts "TEST2"}}}'
+    result = run_tests "spec", :type => 'rspec', :add => "--serialize-stdout"
+
+    result.should_not =~ /TEST1.*TEST2.*TEST1/m
+    result.should_not =~ /TEST2.*TEST1.*TEST2/m
+  end
+
   context "with given commands" do
     it "can exec given commands with ENV['TEST_ENV_NUM']" do
       result = `#{executable} -e 'ruby -e "print ENV[:TEST_ENV_NUMBER.to_s].to_i"' -n 4`
@@ -89,6 +98,12 @@ describe 'CLI' do
       result.split("\n").should == %w["" "2" "3" "4"]
     end
 
+    it "can serialize stdout" do
+      result = `#{executable} -e 'ruby -e "5.times{sleep 0.01;puts ENV[:TEST_ENV_NUMBER.to_s].to_i;STDOUT.flush}"' -n 2 --serialize-stdout`
+      result.should_not =~ /0.*2.*0/m
+      result.should_not =~ /2.*0.*2/m
+    end
+
     it "exists with success if all sub-processes returned success" do
       system("#{executable} -e 'cat /dev/null' -n 4").should == true
     end

data/spec/parallel_tests/test/runner_spec.rb

@@ -37,6 +37,14 @@ describe ParallelTests::Test::Runner do
       ParallelTests::Test::Runner.should_receive(:open).and_return io
       call(['xxx'],1,22,{})[:stdout].should =~ /\$LOAD_PATH << File/
     end
+
+    it "does not output to stdout when serializing output" do
+      io = open('spec/spec_helper.rb')
+      $stdout.should_not_receive(:print)
+      $stdout.should_not_receive(:flush)
+      ParallelTests::Test::Runner.should_receive(:open).and_return io
+      call(['xxx'],1,22,{:serialize_stdout => true})[:stdout]
+    end
   end
 
   describe :test_in_groups do

data/spec/spec_helper.rb

@@ -18,6 +18,9 @@ OutputLogger = Struct.new(:output) do
 end
 
 RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+
   config.after do
     ENV.delete("TEST_ENV_NUMBER")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2796849733728312962
+      hash: -3820588893429922123
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2796849733728312962
+      hash: -3820588893429922123
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25