parallel_tests 0.12.4 → 0.13.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.12.4)
+    parallel_tests (0.13.0)
       parallel
 
 GEM

data/lib/parallel_tests/test/runner.rb

@@ -63,30 +63,10 @@ module ParallelTests
         end.join(";")
         cmd = "#{exports};#{cmd}"
 
-        output, errput, exitstatus = nil
-        if RUBY_PLATFORM == "java"
-          # - JRuby's popen3 doesn't pass arguments correctly to the shell, so we use stdin
-          # - JRuby's open cannot handle local variables properly so we would have to use instance variables
-          Open3.popen3("sh -") do |stdin, stdout, stderr, thread|
-             stdin.puts cmd
-             stdin.close
-             output, errput = capture_output(stdout, stderr, silence)
-          end
-          exitstatus = $?.exitstatus
-        elsif RUBY_VERSION =~ /^1\.8/ or ENV["TEAMCITY_RAKE_RUNNER_MODE"] # fix #207
-          open("|#{cmd}", "r") do |output|
-            output, errput = capture_output(output, nil, silence)
-          end
-          exitstatus = $?.exitstatus
-        else
-          Open3.popen3(cmd) do |stdin, stdout, stderr, thread|
-            stdin.close
-            output, errput = capture_output(stdout, stderr, silence)
-            exitstatus = thread.value.exitstatus
-          end
-        end
+        output = open("|#{cmd}", "r") { |output| capture_output(output, silence) }
+        exitstatus = $?.exitstatus
 
-        {:stdout => output, :stderr => errput, :exit_status => exitstatus}
+        {:stdout => output, :exit_status => exitstatus}
       end
 
       def self.find_results(test_output)
@@ -126,24 +106,16 @@ module ParallelTests
       end
 
       # read output of the process and print it in chunks
-      def self.capture_output(out, err, silence)
-        results = ["", ""]
+      def self.capture_output(out, silence)
+        result = ""
         loop do
-          [[out, $stdout, 0], [err, $stderr, 1]].each do |input, output, index|
-            next unless input
-            begin
-              read = input.readpartial(1000000) # read whatever chunk we can get
-              results[index] << read
-              if index == 1 || !silence
-                output.print read
-                output.flush
-              end
-            rescue EOFError
-              raise if index == 0 # we only care about the end of stdout
-            end
+          begin
+            read = out.readpartial(1000000) # read whatever chunk we can get
+            result << read
+            $stdout.print read if !silence
           end
         end rescue EOFError
-        results
+        result
       end
 
       def self.with_runtime_info(tests)

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.12.4'
+  VERSION = Version = '0.13.0'
 end

data/spec/parallel_tests/rspec/runtime_logger_spec.rb

@@ -73,4 +73,45 @@ describe ParallelTests::RSpec::RuntimeLogger do
     result.should_not include('FooBar')
     result.should include('foo.rb')
   end
+
+  context "integration" do
+    around do |example|
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir, &example)
+      end
+    end
+
+    def write(file, content)
+      FileUtils.mkdir_p(File.dirname(file))
+      File.open(file, 'w') { |f| f.write content }
+    end
+
+    it "logs shared examples into the running files" do
+      pending "no support in rspec for this :/"
+
+      write "spec/spec_helper.rb", <<-RUBY
+        shared_examples "foo" do
+          it "is slow" do
+            sleep 0.5
+          end
+        end
+      RUBY
+
+      ["a", "b"].each do |letter|
+        write "spec/#{letter}_spec.rb", <<-RUBY
+          require 'spec_helper'
+          describe 'xxx' do
+            it_behaves_like "foo"
+          end
+        RUBY
+      end
+
+      system("TEST_ENV_NUMBER=1 rspec spec -I #{Bundler.root.join("lib")} --format ParallelTests::RSpec::RuntimeLogger --out runtime.log 2>&1") || raise("nope")
+
+      result = File.read("runtime.log")
+      result.should include "a_spec:0.5"
+      result.should include "b_spec:0.5"
+      result.should_not include "spec_helper"
+    end
+  end
 end

data/spec/parallel_tests/test/runner_spec.rb

@@ -300,7 +300,6 @@ EOF
         result = call("ruby #{path}", 1, 4, {})
         result.should == {
           :stdout => "2\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
@@ -311,7 +310,6 @@ EOF
         result = call("ruby #{path}", 0, 4, {})
         result.should == {
           :stdout => "\"\"\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
@@ -322,24 +320,19 @@ EOF
         result = call("ruby #{path}", 1, 4, {})
         result.should == {
           :stdout => "4\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
     end
 
     it "skips reads from stdin" do
-      if RUBY_VERSION =~ /^1\.8/
-        pending
-      else
-        run_with_file("$stdin.read; puts 123") do |path|
-          result = call("ruby #{path}", 1, 2, {})
-          result.should == {
-            :stdout => "123\n",
-            :stderr => "",
-            :exit_status => 0
-          }
-        end
+      pending "hangs on normal ruby, works on jruby" unless RUBY_PLATFORM == "java"
+      run_with_file("$stdin.read; puts 123") do |path|
+        result = call("ruby #{path}", 1, 2, {})
+        result.should == {
+          :stdout => "123\n",
+          :exit_status => 0
+        }
       end
     end
 
@@ -348,14 +341,13 @@ EOF
         result = call("ruby #{path}", 1, 4, {})
         result.should == {
           :stdout => "123\n345\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
     end
 
     it "prints output while running" do
-      pending if RUBY_PLATFORM == "java"
+      pending "too slow" if RUBY_PLATFORM == " java"
       run_with_file("$stdout.sync = true; puts 123; sleep 0.1; print 345; sleep 0.1; puts 567") do |path|
         received = ""
         $stdout.stub(:print).with{|x| received << x.strip }
@@ -363,7 +355,6 @@ EOF
         received.should == "123345567"
         result.should == {
           :stdout => "123\n345567\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
@@ -374,7 +365,6 @@ EOF
         result = call("ruby #{path}", 1, 4, {})
         result.should == {
           :stdout => "123\n345\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
@@ -386,7 +376,6 @@ EOF
         result = call("ruby #{path}", 1, 4, :serialize_stdout => true)
         result.should == {
           :stdout => "123\n",
-          :stderr => "",
           :exit_status => 0
         }
       end
@@ -397,26 +386,21 @@ EOF
         result = call("ruby #{path}", 1, 4, {})
         result.should == {
           :stdout => "123\n",
-          :stderr => "",
           :exit_status => 5
         }
       end
     end
 
     it "prints each stream to the correct stream" do
-      if RUBY_VERSION =~ /^1\.8/
-        pending
-      else
-        out, err = run_with_file("puts 123 ; $stderr.puts 345 ; exit 5") do |path|
-          result = call("ruby #{path}", 1, 4, {})
-          result.should == {
-            :stdout => "123\n",
-            :stderr => "345\n",
-            :exit_status => 5
-          }
-        end
-        err.should == "345\n"
+      pending "open3"
+      out, err = run_with_file("puts 123 ; $stderr.puts 345 ; exit 5") do |path|
+        result = call("ruby #{path}", 1, 4, {})
+        result.should == {
+          :stdout => "123\n",
+          :exit_status => 5
+        }
       end
+      err.should == "345\n"
     end
 
     it "uses a lower priority process when the nice option is used" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2419749172313192227
+      hash: 1322916282781841977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2419749172313192227
+      hash: 1322916282781841977
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25