parallel_tests 0.3.6 → 0.3.7

data/README.markdown

@@ -62,13 +62,12 @@ Setup for non-rails
 Options are:
     -n [PROCESSES]                   How many processes to use, default: available CPUs
     -p, --path [PATH]                run tests inside this path only
-    -f path/to/test_file,path/to/other_test_file
-        --files                      run these test files (comma-separated list w/o spaces)
+    --no-sort                        do not sort files before running them
     -r, --root [PATH]                execute test commands from this path
     -f, --files [FILES]              run these test files (comma-separated list w/o spaces)
     -m, --multiply-processes [FLOAT] use given number as a multiplier of processes to run
     -e, --exec [COMMAND]             execute this code parallel and with ENV['TEST_ENV_NUM']
-    -o, --test-options '[SOMETHING]' execute test commands with those options
+    -o, --test-options '[OPTIONS]' execute test commands with those options
     -t, --type [TYPE]                which type of tests to run? test, spec or features
     -v, --version                    Show Version
     -h, --help                       Show this.
@@ -114,7 +113,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Kevin Scaldeferri](http://kevin.scaldeferri.com/blog/)
  - [Kpumuk](http://kpumuk.info/)
  - [Maksim Horbul](http://github.com/mhorbul)
- - [Pivotal Labs][http://pivotallabs.com]
+ - [Pivotal Labs](http://www.pivotallabs.com)
  - [Rohan Deshpande](http://github.com/rdeshpande)
  - [Tchandy](http://thiagopradi.net/)
  - [Terence Lee](http://hone.heroku.com/)

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/bin/parallel_test

@@ -13,6 +13,7 @@ Options are:
 BANNER
   opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: available CPUs"){|n| options[:count] = n }
   opts.on("-p", '--path [PATH]', "run tests inside this path only"){|path| options[:path_prefix] = path }
+  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("-r", '--root [PATH]', "execute test commands from this path"){|path| options[:root] = path }
   opts.on("-e", '--exec [COMMAND]', "execute this code parallel and with ENV['TEST_ENV_NUM']"){|path| options[:execute] = path }
@@ -22,7 +23,6 @@ BANNER
   opts.on("-h", "--help", "Show this.") { puts opts; exit }
 end.parse!
 
-
 # get files to run from arguments
 options[:files] = ARGV if ARGV.size > 0
 
@@ -50,7 +50,7 @@ else
   tests_folder = File.join(task, options[:path_prefix].to_s)
   tests_folder = File.join(options[:root], tests_folder) unless options[:root].to_s.empty?
 
-  groups = klass.tests_in_groups(options[:files] || tests_folder, num_processes)
+  groups = klass.tests_in_groups(options[:files] || tests_folder, num_processes, :no_sort => options[:no_sort])
   num_processes = groups.size
 
   #adjust processes to groups

data/lib/parallel_tests.rb

@@ -18,8 +18,9 @@ class ParallelTests
   end
 
   # finds all tests and partitions them into groups
-  def self.tests_in_groups(root, num)
-    tests_with_sizes = slow_specs_first(find_tests_with_sizes(root))
+  def self.tests_in_groups(root, num, options={})
+    tests_with_sizes = find_tests_with_sizes(root)
+    tests_with_sizes = slow_specs_first(tests_with_sizes) unless options[:no_sort]
 
     # always add to smallest group
     groups = Array.new(num){{:tests => [], :size => 0}}

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-05-15}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.extra_rdoc_files = [

data/spec/integration_spec.rb

@@ -91,4 +91,11 @@ describe 'CLI' do
     result.should include('333')
     result.should_not include('222')
   end
-end
+
+  it "can run with test-options" do
+    write "x1_spec.rb", ""
+    write "x2_spec.rb", ""
+    result = run_specs(:add => "--test-options ' --version'", :processes => 2)
+    result.should =~ /^rspec [\d\.]+\nrspec [\d\.]+$/m # prints version twice
+  end
+end

data/spec/parallel_tests_spec.rb

@@ -49,6 +49,25 @@ describe ParallelTests do
     end
   end
 
+  describe :test_in_groups do
+    it "does not sort when passed false do_sort option" do
+      ParallelTests.should_not_receive(:slow_specs_first)
+      ParallelTests.tests_in_groups [], 1, :no_sort => true
+    end
+
+    it "does sort when not passed do_sort option" do
+      ParallelTests.stub!(:find_tests_with_sizes).and_return([])
+      ParallelTests.should_receive(:slow_specs_first).and_return([])
+      ParallelTests.tests_in_groups [], 1
+    end
+
+    it "does sort when not passed true do_sort option" do
+      ParallelTests.stub!(:find_tests_with_sizes).and_return([])
+      ParallelTests.should_receive(:slow_specs_first).and_return([])
+      ParallelTests.tests_in_groups [], 1
+    end
+  end
+
   describe :find_results do
     it "finds multiple results in test output" do
       output = <<EOF

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +02:00
+date: 2010-05-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency