parallel_tests 1.0.5 → 1.0.6

data/.travis.yml

@@ -5,3 +5,6 @@ rvm:
   - 2.1.0
   - jruby-1.7.6
   - jruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head

data/Gemfile.lock

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

data/Readme.md

@@ -184,7 +184,7 @@ Options are:
         --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
         --nice                       execute test commands with low priority.
-        --only-group [INTEGER]       Group the files, but only run the group specified here. Requires group-by filesize (will be set automatically if group-by is blank and only-group is specified)
+        --only-group INT[, INT]      Group the files, but only run the group(s) specified here. Requires group-by filesize (will be set automatically if group-by is blank and only-group is specified)
     -v, --version                    Show Version
     -h, --help                       Show this.
 

data/lib/parallel_tests/cli.rb

@@ -36,9 +36,11 @@ module ParallelTests
         groups = @runner.tests_in_groups(options[:files], num_processes, options)
 
         test_results = if options[:only_group]
-          group_to_run = groups[options[:only_group] - 1]
-
-          [run_tests(group_to_run, 0, num_processes, options)]
+          groups_to_run = options[:only_group].collect{|i| groups[i - 1]}
+          report_number_of_tests(groups_to_run)
+          execute_in_parallel(groups_to_run, groups_to_run.size, options) do |group|
+            run_tests(group, groups_to_run.index(group), 1, options)
+          end
         else
           report_number_of_tests(groups)
 
@@ -124,7 +126,7 @@ TEXT
           options[:isolate] = true
         end
 
-        opts.on("--only-group [INTEGER]", Integer) { |group| options[:only_group] = group }
+        opts.on("--only-group INT[, INT]", Array) { |groups| options[:only_group] = groups.map(&:to_i) }
 
         opts.on("-e", "--exec [COMMAND]", "execute this code parallel and with ENV['TEST_ENV_NUM']") { |path| options[:execute] = path }
         opts.on("-o", "--test-options '[OPTIONS]'", "execute test commands with those options") { |arg| options[:test_options] = arg }

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '1.0.5'
+  VERSION = Version = '1.0.6'
 end

data/spec/parallel_tests/cli_spec.rb

@@ -33,6 +33,30 @@ describe ParallelTests::CLI do
     it "parses nice as nice" do
       call(["--nice"]).should == defaults.merge(:nice => true)
     end
+
+    context "parse only-group" do
+      it "group_by should be set to filesize" do
+        call(["--only-group", '1']).should == defaults.merge(:group_by=>:filesize, :only_group => [1])
+      end
+
+      it "raise error when group_by isn't filesize" do
+        expect{
+          call(["--only-group", '1', '--group-by', 'steps'])
+        }.to raise_error(RuntimeError)
+      end
+
+      context "with group_by default to filesize" do
+        let(:defaults_with_filesize){defaults.merge(:group_by => :filesize)}
+
+        it "with multiple groups" do
+          call(["--only-group", '4,5']).should == defaults_with_filesize.merge(:only_group => [4,5])
+        end
+
+        it "with a single group" do
+          call(["--only-group", '4']).should == defaults_with_filesize.merge(:only_group => [4])
+        end
+      end
+    end
   end
 
   describe "#load_runner" do
@@ -73,6 +97,45 @@ describe ParallelTests::CLI do
       subject.send(:final_fail_message).should == "\e[31mTests Failed\e[0m"
     end
   end
+  
+  describe "#run_tests_in_parallel" do
+    context "specific groups to run" do
+      let(:results){ {:stdout => "", :exit_status => 0} }
+      before do
+        subject.should_receive(:load_runner).with("my_test_runner").and_return(ParallelTests::MyTestRunner::Runner)
+        ParallelTests::MyTestRunner::Runner.stub(:test_file_name).and_return("test")
+        ParallelTests::MyTestRunner::Runner.should_receive(:tests_in_groups).and_return([
+          ['aaa','bbb'],
+          ['ccc', 'ddd'],
+          ['eee', 'fff']
+        ])
+        subject.should_receive(:report_results).and_return(nil)
+      end
+
+      it "calls run_tests once when one group specified" do
+        subject.should_receive(:run_tests).once.and_return(results)
+        subject.run(['-n', '3', '--only-group', '1', '-t', 'my_test_runner'])
+      end
+
+      it "calls run_tests twice when two groups are specified" do
+        subject.should_receive(:run_tests).twice.and_return(results)
+        subject.run(['-n', '3', '--only-group', '1,2', '-t', 'my_test_runner'])
+      end
+      
+      it "run only one group specified" do
+        options = {:count=>3, :only_group=>[2], :files=>[], :group_by=>:filesize}
+        subject.should_receive(:run_tests).once.with(['ccc', 'ddd'], 0, 1, options).and_return(results)
+        subject.run(['-n', '3', '--only-group', '2', '-t', 'my_test_runner'])
+      end
+      
+      it "run twice with multiple groups" do
+        options = {:count=>3, :only_group=>[2,3], :files=>[], :group_by=>:filesize}
+        subject.should_receive(:run_tests).once.ordered.with(['ccc', 'ddd'], 0, 1, options).and_return(results)
+        subject.should_receive(:run_tests).once.ordered.with(['eee', 'fff'], 1, 1, options).and_return(results)
+        subject.run(['-n', '3', '--only-group', '2,3', '-t', 'my_test_runner'])
+      end
+    end
+  end
 end
 
 

data/spec/parallel_tests/gherkin/runner_behaviour.rb

@@ -192,7 +192,8 @@ EOF
       test_files = %w(features/a.rb:23 features/a.rb:44 features/b.rb:12)
 
       ParallelTests::Test::Runner.should_receive(:execute_command).with do |a,b,c,d|
-        a =~ Regexp.new('features/a.rb:23:44 features/b.rb:12')
+        argv = a.split("--").last.split(" ")[2..-1].sort
+        argv == ["features/a.rb:23:44", "features/b.rb:12"]
       end
 
       call(test_files, 1, 2, { :group_by => :scenarios })

metadata

@@ -1,42 +1,51 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: parallel_tests
-version: !ruby/object:Gem::Version
-  version: 1.0.5
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 6
+  version: 1.0.6
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-08-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
 description: 
 email: michael@grosser.it
-executables:
+executables: 
 - parallel_spinach
 - parallel_cucumber
 - parallel_rspec
 - parallel_test
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -88,27 +97,37 @@ files:
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/parallel_tests
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Run Test::Unit / RSpec / Cucumber / Spinach in parallel
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 95fdce8bba80efd898bd2be638c7d8ac3ed01e50
-  data.tar.gz: c7070894cfb9c0b4befaedb42d9e91d45a578eca
-SHA512:
-  metadata.gz: f818a67bc31e2cac2daa2f3621c1c0c10cf58a23e1228a124b43af356d5025db24a231c73a456e0178cdd31939ca7cead04d698630a29f20e8ab82941de0b4ec
-  data.tar.gz: dd574fc4717185181ba2c213d5af4683b97a88a7df7bc326201131e954d9d8da555eb6cf7b30af3310f6cdd4bbcaebe464076895443394ecd3e9acbc92ffd0d7