parallel_tests 0.9.2 → 0.9.3

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/Gemfile.lock

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

data/Readme.md

@@ -65,6 +65,20 @@ Test by pattern (e.g. use one integration server per subfolder / see if you brok
 
     Took 29.925333 seconds
 
+Running things once
+===================
+
+```Ruby
+# effected by race-condition: first process may boot slower the second
+# either sleep a bit or use a lock for example File.lock
+ParallelTests.first_process? ? do_something : sleep(1)
+
+at_exit do
+  ParallelTests.wait_for_other_processes_to_finish
+  undo_something
+end
+```
+
 Loggers
 ===================
 
@@ -178,8 +192,9 @@ TIPS
 
 TODO
 ====
+ - make tests consistently pass with `--order random` in .rspec
  - fix tests vs cucumber >= 1.2 `unknown option --format`
- - add tests for the rake tasks, maybe generate a rails project ...
+ - add integration tests for the rake tasks, maybe generate a rails project ...
  - add unit tests for cucumber runtime formatter
  - make jRuby compatible [basics](http://yehudakatz.com/2009/07/01/new-rails-isolation-testing/)
  - make windows compatible

data/lib/parallel_tests.rb

@@ -4,6 +4,8 @@ require 'parallel_tests/grouper'
 require 'parallel_tests/railtie' if defined? Rails::Railtie
 
 module ParallelTests
+  GREP_PROCESSES_COMMAND = "ps -ef | grep [T]EST_ENV_NUMBER= 2>&1"
+
   def self.determine_number_of_processes(count)
     [
       count,
@@ -27,4 +29,20 @@ module ParallelTests
 
     false
   end
+
+  def self.first_process?
+    !ENV["TEST_ENV_NUMBER"] || ENV["TEST_ENV_NUMBER"].to_i == 0
+  end
+
+  def self.wait_for_other_processes_to_finish
+    return unless ENV["TEST_ENV_NUMBER"]
+    sleep 1 until number_of_running_processes <= 1
+  end
+
+  # Fun fact: this includes the current process if it's run via parallel_tests
+  def self.number_of_running_processes
+    result = `#{GREP_PROCESSES_COMMAND}`
+    raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
+    result.split("\n").size
+  end
 end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.9.2'
+  VERSION = Version = '0.9.3'
 end

data/spec/integration_spec.rb

@@ -172,6 +172,14 @@ describe 'CLI' do
     result.should include('ZZZ')
   end
 
+  it "can wait_for_other_processes_to_finish" do
+    write "test/a_test.rb", "require 'parallel_tests'; ParallelTests.wait_for_other_processes_to_finish; puts 'a'"
+    write "test/b_test.rb", "sleep 1; puts 'b'"
+    write "test/c_test.rb", "sleep 1.5; puts 'c'"
+    write "test/d_test.rb", "sleep 2; puts 'd'"
+    run_tests("test", :processes => 4).should include("b\nc\nd\na\n")
+  end
+
   context "Test::Unit" do
     it "runs" do
       write "test/x1_test.rb", "require 'test/unit'; class XTest < Test::Unit::TestCase; def test_xxx; end; end"

data/spec/parallel_tests/test/runtime_logger_spec.rb

@@ -44,7 +44,13 @@ describe ParallelTests::Test::RuntimeLogger do
     end
   end
 
-  describe :formatting do
+  describe "formatting" do
+    def with_rails_defined
+      Object.const_set(:Rails, Module.new)
+      yield
+      Object.send(:remove_const, :Rails)
+    end
+
     def call(*args)
       ParallelTests::Test::RuntimeLogger.message(*args)
     end
@@ -68,17 +74,17 @@ describe ParallelTests::Test::RuntimeLogger do
     end
 
     it "guesses subdirectory structure for rails test classes" do
-      module Rails
-      end
-      class ActionController
-        class TestCase
+      with_rails_defined do
+        class ActionController
+          class TestCase
+          end
         end
+        class FakeControllerTest < ActionController::TestCase
+        end
+        test = FakeControllerTest.new
+        time = Time.now
+        call(test, time, Time.at(time.to_f+2.00)).should == 'test/functional/fake_controller_test.rb:2.00'
       end
-      class FakeControllerTest < ActionController::TestCase
-      end
-      test = FakeControllerTest.new
-      time = Time.now
-      call(test, time, Time.at(time.to_f+2.00)).should == 'test/functional/fake_controller_test.rb:2.00'
     end
   end
 end

data/spec/parallel_tests_spec.rb

@@ -34,7 +34,7 @@ describe ParallelTests do
     end
   end
 
-  describe :bundler_enabled? do
+  describe ".bundler_enabled?" do
     before do
       Object.stub!(:const_defined?).with(:Bundler).and_return false
     end
@@ -67,6 +67,69 @@ describe ParallelTests do
     end
   end
 
+  describe ".wait_for_other_processes_to_finish" do
+    def with_running_processes(count, wait=0.2)
+      count.times { Thread.new{ `TEST_ENV_NUMBER=1; sleep #{wait}` } }
+      sleep 0.1
+      yield
+    ensure
+      sleep wait # make sure the threads have finished
+    end
+
+    it "does not wait if not run in parallel" do
+      ParallelTests.should_not_receive(:sleep)
+      ParallelTests.wait_for_other_processes_to_finish
+    end
+
+    it "stops if only itself is running" do
+      ENV["TEST_ENV_NUMBER"] = "2"
+      ParallelTests.should_not_receive(:sleep)
+      with_running_processes(1) do
+          ParallelTests.wait_for_other_processes_to_finish
+        end
+    end
+
+    it "waits for other processes to finish" do
+      ENV["TEST_ENV_NUMBER"] = "2"
+      counter = 0
+      ParallelTests.stub(:sleep).with{ sleep 0.1; counter += 1 }
+      with_running_processes(2, 0.4) do
+        ParallelTests.wait_for_other_processes_to_finish
+      end
+      counter.should == 3
+    end
+  end
+
+  describe ".number_of_running_processes" do
+    it "is 0 for nothing" do
+      ParallelTests.number_of_running_processes.should == 0
+    end
+
+    it "is 2 when 2 are running" do
+      wait = 0.2
+      2.times { Thread.new{ `TEST_ENV_NUMBER=1; sleep #{wait}` } }
+      sleep 0.1
+      ParallelTests.number_of_running_processes.should == 2
+      sleep wait
+    end
+  end
+
+  describe ".first_process?" do
+    it "is first if no env is set" do
+      ParallelTests.first_process?.should == true
+    end
+
+    it "is first if env is set to blank" do
+      ENV["TEST_ENV_NUMBER"] = ""
+      ParallelTests.first_process?.should == true
+    end
+
+    it "is not first if env is set to something" do
+      ENV["TEST_ENV_NUMBER"] = "2"
+      ParallelTests.first_process?.should == false
+    end
+  end
+
   it "has a version" do
     ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+/
   end

data/spec/spec_helper.rb

@@ -20,6 +20,12 @@ OutputLogger = Struct.new(:output) do
   end
 end
 
+RSpec.configure do |config|
+  config.after do
+    ENV.delete("TEST_ENV_NUMBER")
+  end
+end
+
 def mocked_process
   open('|cat /dev/null')
 end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease: 
-  version: 0.9.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :runtime
   prerelease: false
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :runtime
 description: 
 email: michael@grosser.it
 executables:
@@ -37,6 +37,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -84,23 +85,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1348773835990268798
-  none: false
+      hash: -3882668074104783522
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1348773835990268798
-  none: false
+      hash: -3882668074104783522
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24