parallel_tests 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/{tasks → lib/tasks}/parallel_tests.rake

@@ -1,31 +1,33 @@
 namespace :parallel do
-  desc "update test databases by running db:test:prepare for each --> parallel:prepare[num_cpus]"
-  task :prepare, :count do |t,args|
-    require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_tests")
+  def run_in_parallel(cmd, options)
+    count = (options[:count] ? options[:count].to_i : nil)
+    system "#{File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')} --exec '#{cmd}' -n #{count}"
+  end
 
-    Parallel.in_processes(args[:count] ? args[:count].to_i : nil) do |i|
-      puts "Preparing test database #{i + 1}"
-      exec "export TEST_ENV_NUMBER=#{ParallelTests.test_env_number(i)} ; rake db:test:prepare"
-    end
+  desc "update test databases by running db:test:prepare for each test db --> parallel:prepare[num_cpus]"
+  task :prepare, :count do |t,args|
+    run_in_parallel('rake db:test:prepare', args)
   end
 
-  # Useful when dumping/resetting takes too long
-  desc "update test databases by running db:mgrate for each --> parallel:migrate[num_cpus]"
+  # when dumping/resetting takes too long
+  desc "update test databases by running db:mgrate for each test db --> parallel:migrate[num_cpus]"
   task :migrate, :count do |t,args|
-    require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_tests")
+    run_in_parallel('rake db:migrate RAILS_ENV=test', args)
+  end
 
-    Parallel.in_processes(args[:count] ? args[:count].to_i : nil) do |i|
-      puts "Migrating test database #{i + 1}"
-      exec "export TEST_ENV_NUMBER=#{ParallelTests.test_env_number(i)} ; rake db:migrate RAILS_ENV=test"
-    end
+  # Do not want a development db on integration server.
+  # and always dump a complete schema ?
+  desc "load dumped schema for each test db --> parallel:load_schema[num_cpus]"
+  task :load_schema, :count do |t,args|
+    run_in_parallel('rake db:schema:load RAILS_ENV=test', args)
   end
 
   ['test', 'spec', 'features'].each do |type|
     desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
     task type, :count, :path_prefix, :options do |t,args|
-      require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_tests")
+      require File.join(File.dirname(__FILE__), '..', "parallel_tests")
       count, prefix, options = ParallelTests.parse_rake_args(args)
-      exec "#{File.join(File.dirname(__FILE__), '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"
+      exec "#{File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"
     end
   end
 end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-03-23}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_test", "parallel_spec", "parallel_cucumber"]
   s.extra_rdoc_files = [
@@ -27,13 +27,13 @@ Gem::Specification.new do |s|
      "lib/parallel_specs.rb",
      "lib/parallel_specs/spec_runtime_logger.rb",
      "lib/parallel_tests.rb",
+     "lib/tasks/parallel_tests.rake",
      "parallel_tests.gemspec",
      "spec/integration_spec.rb",
      "spec/parallel_cucumber_spec.rb",
      "spec/parallel_specs_spec.rb",
      "spec/parallel_tests_spec.rb",
-     "spec/spec_helper.rb",
-     "tasks/parallel_tests.rake"
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/grosser/parallel_tests}
   s.rdoc_options = ["--charset=UTF-8"]

data/spec/integration_spec.rb

@@ -78,6 +78,7 @@ describe 'CLI' do
     write 'xxx6_spec.rb', 'describe("it"){it("should"){sleep 2}}'
     t = Time.now
     run_specs :processes => 6
-    (Time.now - t).should < (Parallel.processor_count == 1 ? 10 : 5)
+    expected = ((Parallel.processor_count == 1 or ENV['RUN_CODE_RUN']) ? 10 : 5)
+    (Time.now - t).should <= expected
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,13 +51,13 @@ files:
 - lib/parallel_specs.rb
 - lib/parallel_specs/spec_runtime_logger.rb
 - lib/parallel_tests.rb
+- lib/tasks/parallel_tests.rake
 - parallel_tests.gemspec
 - spec/integration_spec.rb
 - spec/parallel_cucumber_spec.rb
 - spec/parallel_specs_spec.rb
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
-- tasks/parallel_tests.rake
 has_rdoc: true
 homepage: http://github.com/grosser/parallel_tests
 licenses: []