parallel_tests 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 686483f7dc8498a77a68696e67e20a4306c01227
-  data.tar.gz: 01b43608ce56b14847094336251caeb00b19b334
+  metadata.gz: dbd377cc06273701434d7d01cd12c2da000425f1
+  data.tar.gz: cb7bd407b705223e273146cefff4dad1e3845b1d
 SHA512:
-  metadata.gz: e12060b53c7dda0bf83378bc4281b732bc95c530ac3b91ece0cd6a5ac99c9ef93d8be70b19c36403c34fdc2db09a158d688b5925020991d6eda0033c131f0ad1
-  data.tar.gz: 095d5a39cd83a0789c18c0366915c8ddb18866cf461892179fae0dfcc09d6754191f6cab9b0195162ea3c2cc446b6416ee58d5efc53a568f5433dc3aeff011d8
+  metadata.gz: 7d155b74b7ea83a7521decb4dcaf72d2cccb97f3eb8d43950424001e57b20b895d2f826d93b2960351e7d5435bf055e4d4a829d6baff7dcfe9d391591987ddac
+  data.tar.gz: 66a159a28709388b78930da6e2e772b6dcc2898f6d3743a869d6d45e4292af65edfa4960daa0cca41a5e0f313d6a5b6b17d1489ac3033d5d46b649165362ecb9

data/Gemfile.lock

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

data/Readme.md

@@ -180,6 +180,7 @@ Options are:
     -o, --test-options '[OPTIONS]'   execute test commands with those options
     -t, --type [TYPE]                test(default) / rspec / cucumber / spinach
         --serialize-stdout           Serialize stdout output, nothing will be written until everything is done
+        --combine-stderr             Combine stderr into stdout, useful in conjunction with --serialize-stdout
         --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
@@ -300,6 +301,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Dmitry Polushkin](https://github.com/dmitry)
  - [Samer Masry](https://github.com/smasry)
  - [Volodymyr Mykhailyk](https:/github.com/volodymyr-mykhailyk)
+ - [Mike Mueller](https://github.com/mmueller)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cli.rb

@@ -139,6 +139,7 @@ TEXT
           end
         end
         opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
+        opts.on("--combine-stderr", "Combine stderr into stdout, useful in conjunction with --serialize-stdout") { options[:combine_stderr] = 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 }

data/lib/parallel_tests/test/runner.rb

@@ -57,6 +57,8 @@ module ParallelTests
             "PARALLEL_TEST_GROUPS" => num_processes
           )
           cmd = "nice #{cmd}" if options[:nice]
+          cmd = "#{cmd} 2>&1" if options[:combine_stderr]
+
           execute_command_and_capture_output(env, cmd, options[:serialize_stdout])
         end
 

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '1.0.8'
+  VERSION = Version = '1.0.9'
 end

data/spec/integration_spec.rb

@@ -114,6 +114,15 @@ describe 'CLI' do
     result.should_not =~ /TEST2.*TEST1.*TEST2/m
   end
 
+  it "can serialize stdout and stderr" do
+    write 'spec/xxx_spec.rb', '5.times{describe("it"){it("should"){sleep 0.01; $stderr.puts "errTEST1"; puts "TEST1"}}}'
+    write 'spec/xxx2_spec.rb', 'sleep 0.01; 5.times{describe("it"){it("should"){sleep 0.01; $stderr.puts "errTEST2"; puts "TEST2"}}}'
+    result = run_tests "spec", :type => 'rspec', :add => "--serialize-stdout --combine-stderr"
+
+    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`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Michael Grosser