parallel_tests 0.6.15 → 0.6.16

data/Gemfile

@@ -3,6 +3,7 @@ source :rubygems
 gem 'parallel'
 
 group :dev do
+  gem 'test-unit', :platform => :ruby_19
   gem 'rspec', '>=2.4'
   gem 'rake'
   gem 'jeweler'

data/Gemfile.lock

@@ -17,6 +17,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    test-unit (2.4.4)
 
 PLATFORMS
   ruby
@@ -26,3 +27,4 @@ DEPENDENCIES
   parallel
   rake
   rspec (>= 2.4)
+  test-unit

data/Readme.md

@@ -81,7 +81,7 @@ Example output
 
     Took 29.925333 seconds
 
-Spec Loggers
+Loggers
 ===================
 
 Even process runtimes
@@ -89,7 +89,7 @@ Even process runtimes
 
 Log test runtime to give each process the same runtime.
 
-Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
+Rspec: Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
 
     RSpec 1.x:
       --format progress
@@ -100,6 +100,10 @@ Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
       --format progress
       --format ParallelSpecs::SpecRuntimeLogger --out tmp/parallel_profile.log
 
+Test::Unit:  Add to your `test_helper.rb`:
+    require 'parallel_tests/runtime_logger'
+
+
 SpecSummaryLogger
 --------------------
 
@@ -189,7 +193,6 @@ TIPS
  - [Capybara setup](https://github.com/grosser/parallel_tests/wiki)
  - [Sphinx setup](https://github.com/grosser/parallel_tests/wiki)
  - [Capistrano setup](https://github.com/grosser/parallel_tests/wiki/Remotely-with-capistrano) let your tests run on a big box instead of your laptop
- - [Test::Unit runtime logger](https://gist.github.com/1333414) some basic plumbing done (needs some love and a pull-request)
  - [SQL schema format] use :ruby schema format to get faster parallel:prepare`
  - [ActiveRecord] if you do not have `db:abort_if_pending_migrations` add this to your Rakefile: `task('db:abort_if_pending_migrations'){}`
  - `export PARALLEL_TEST_PROCESSORS=X` in your environment and parallel_tests will use this number of processors by default
@@ -229,6 +232,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Geoffrey Hichborn](https://github.com/phene)
  - [Trae Robrock](https://github.com/trobrock)
  - [Lawrence Wang](https://github.com/levity)
+ - [Sean Walbran](https://github.com/seanwalbran)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/VERSION

@@ -1 +1 @@
-0.6.15
+0.6.16

data/lib/parallel_tests/runtime_logger.rb

@@ -0,0 +1,78 @@
+class ParallelTests::RuntimeLogger
+  @@has_started = false
+
+  def self.log(test, start_time, end_time)
+    return if test.is_a? Test::Unit::TestSuite  # don't log for suites-of-suites
+
+    if !@@has_started # make empty log file 
+      File.open(ParallelTests.runtime_log, 'w') do end
+      @@has_started = true
+    end
+
+    File.open(ParallelTests.runtime_log, 'a') do |output|
+      begin
+        output.flock File::LOCK_EX
+        output.puts(self.message(test, start_time, end_time))
+      ensure
+        output.flock File::LOCK_UN
+      end
+    end
+  end
+
+  def self.message(test, start_time, end_time)
+    delta="%.2f" % (end_time.to_f-start_time.to_f)
+    filename=class_directory(test.class) + class_to_filename(test.class) + ".rb"
+    message="#{filename}:#{delta}"
+  end
+
+  # Note: this is a best guess at conventional test directory structure, and may need
+  # tweaking / post-processing to match correctly for any given project
+  def self.class_directory(suspect)
+    result = "test/"
+
+    if defined?(Rails)
+      result += case suspect.superclass.name
+                when "ActionDispatch::IntegrationTest"
+                  "integration/"
+                when "ActionDispatch::PerformanceTest"
+                  "performance/"
+                when "ActionController::TestCase"
+                  "functional/"
+                when "ActionView::TestCase"
+                  "unit/helpers/"
+                else
+                  "unit/"
+                end
+    end
+    result
+  end
+
+  # based on https://github.com/grosser/single_test/blob/master/lib/single_test.rb#L117
+  def self.class_to_filename(suspect)
+    word = suspect.to_s.dup
+    return word unless word.match /^[A-Z]/ and not word.match %r{/[a-z]}
+
+    word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    word.gsub!(/\:\:/,'/')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+
+end
+
+require 'test/unit/testsuite'
+class Test::Unit::TestSuite
+
+  alias :run_without_timing :run unless defined? @@timing_installed
+
+  def run(result, &progress_block)
+    start_time=Time.now
+    run_without_timing(result, &progress_block)
+    end_time=Time.now
+    ParallelTests::RuntimeLogger.log(self.tests.first, start_time, end_time)
+  end
+  @@timing_installed = true
+
+end

data/parallel_tests.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "parallel_tests"
-  s.version = "0.6.15"
+  s.version = "0.6.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-01-12"
+  s.date = "2012-01-13"
   s.email = "grosser.michael@gmail.com"
-  s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
+  s.executables = ["parallel_cucumber", "parallel_test", "parallel_spec"]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/parallel_tests.rb",
     "lib/parallel_tests/grouper.rb",
     "lib/parallel_tests/railtie.rb",
+    "lib/parallel_tests/runtime_logger.rb",
     "lib/parallel_tests/tasks.rb",
     "lib/tasks/parallel_tests.rake",
     "parallel_tests.gemspec",
@@ -40,12 +41,13 @@ Gem::Specification.new do |s|
     "spec/parallel_specs/spec_runtime_logger_spec.rb",
     "spec/parallel_specs/spec_summary_logger_spec.rb",
     "spec/parallel_specs_spec.rb",
+    "spec/parallel_tests/runtime_logger_spec.rb",
     "spec/parallel_tests_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/grosser/parallel_tests"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Run tests / specs / features in parallel"
 
   if s.respond_to? :specification_version then

data/spec/parallel_tests/runtime_logger_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe ParallelTests::RuntimeLogger do
+
+  describe :writing do
+    it "overwrites the runtime_log file on first log invocation" do
+      class FakeTest
+      end
+      test = FakeTest.new
+      time = Time.now
+      File.open(ParallelTests.runtime_log, 'w'){ |f| f.puts("FooBar") }
+      ParallelTests::RuntimeLogger.send(:class_variable_set,:@@has_started, false)
+      ParallelTests::RuntimeLogger.log(test, time, Time.at(time.to_f+2.00))
+      result = File.read(ParallelTests.runtime_log)
+      result.should_not include('FooBar')
+      result.should include('test/fake_test.rb:2.00')
+    end
+
+    it "appends to the runtime_log file after first log invocation" do
+      class FakeTest
+      end
+      test = FakeTest.new
+      class OtherFakeTest
+      end
+      other_test = OtherFakeTest.new
+
+      time = Time.now
+      File.open(ParallelTests.runtime_log, 'w'){ |f| f.puts("FooBar") }
+      ParallelTests::RuntimeLogger.send(:class_variable_set,:@@has_started, false)
+      ParallelTests::RuntimeLogger.log(test, time, Time.at(time.to_f+2.00))
+      ParallelTests::RuntimeLogger.log(other_test, time, Time.at(time.to_f+2.00))
+      result = File.read(ParallelTests.runtime_log)
+      result.should_not include('FooBar')
+      result.should include('test/fake_test.rb:2.00')
+      result.should include('test/other_fake_test.rb:2.00')
+    end
+
+  end
+
+  describe :formatting do
+    it "formats results for simple test names" do
+      class FakeTest
+      end
+      test = FakeTest.new
+      time = Time.now
+      ParallelTests::RuntimeLogger.message(test, time, Time.at(time.to_f+2.00)).should == 'test/fake_test.rb:2.00'
+    end
+
+    it "formats results for complex test names" do
+      class AVeryComplex
+        class FakeTest
+        end
+      end
+      test = AVeryComplex::FakeTest.new
+      time = Time.now
+      ParallelTests::RuntimeLogger.message(test, time, Time.at(time.to_f+2.00)).should == 'test/a_very_complex/fake_test.rb:2.00'
+    end
+
+    it "guesses subdirectory structure for rails test classes" do
+      module Rails
+      end
+      class ActionController
+        class TestCase
+        end
+      end
+      class FakeControllerTest < ActionController::TestCase
+      end
+      test = FakeControllerTest.new
+      time = Time.now
+      ParallelTests::RuntimeLogger.message(test, time, Time.at(time.to_f+2.00)).should == 'test/functional/fake_controller_test.rb:2.00'
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'parallel_specs'
 require 'parallel_specs/spec_runtime_logger'
 require 'parallel_specs/spec_summary_logger'
 require 'parallel_cucumber'
+require 'parallel_tests/runtime_logger'
 
 OutputLogger = Struct.new(:output) do
   attr_reader :flock, :flush

metadata

@@ -1,36 +1,47 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: parallel_tests
-version: !ruby/object:Gem::Version
-  version: 0.6.15
+version: !ruby/object:Gem::Version 
+  hash: 39
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 16
+  version: 0.6.16
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: &69308050 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+
+date: 2012-01-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *69308050
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: parallel
+  version_requirements: *id001
 description: 
 email: grosser.michael@gmail.com
-executables:
+executables: 
 - parallel_cucumber
-- parallel_spec
 - parallel_test
+- parallel_spec
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -49,6 +60,7 @@ files:
 - lib/parallel_tests.rb
 - lib/parallel_tests/grouper.rb
 - lib/parallel_tests/railtie.rb
+- lib/parallel_tests/runtime_logger.rb
 - lib/parallel_tests/tasks.rb
 - lib/tasks/parallel_tests.rake
 - parallel_tests.gemspec
@@ -58,33 +70,41 @@ files:
 - spec/parallel_specs/spec_runtime_logger_spec.rb
 - spec/parallel_specs/spec_summary_logger_spec.rb
 - spec/parallel_specs_spec.rb
+- spec/parallel_tests/runtime_logger_spec.rb
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/parallel_tests
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -947870483
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Run tests / specs / features in parallel
 test_files: []
+