test-queue 0.2.9 → 0.2.10

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gemspec
+gem 'minitest', '5.3.3'

data/Gemfile-minitest4

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gemspec
+gem 'minitest', '4.7.3'

data/Gemfile-minitest4.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    test-queue (0.2.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    cucumber (1.3.15)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    minitest (4.7.3)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.1)
+    rspec-expectations (2.99.1)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber (~> 1.3.10)
+  minitest (= 4.7.3)
+  rspec (>= 2.13, < 4.0)
+  test-queue!

data/Gemfile.lock

@@ -16,7 +16,7 @@ GEM
     diff-lcs (1.2.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    minitest (4.7.3)
+    minitest (5.3.3)
     multi_json (1.8.4)
     multi_test (0.0.3)
     rspec (2.13.0)
@@ -33,6 +33,6 @@ PLATFORMS
 
 DEPENDENCIES
   cucumber (~> 1.3.10)
-  minitest (~> 4.7.3)
-  rspec (~> 2.13)
+  minitest (= 5.3.3)
+  rspec (>= 2.13, < 4.0)
   test-queue!

data/README.md

@@ -32,6 +32,9 @@ the workload and relay results back to a central master.
 - `TEST_QUEUE_RELAY`: relay results back to a central master, specified as tcp `address:port`
 - `TEST_QUEUE_STATS`: `path` to cache build stats in-build CI runs (default: `.test_queue_stats`)
 - `TEST_QUEUE_FORCE`: comma separated list of suites to run
+- `TEST_QUEUE_RELAY_TIMEOUT`: when using remote workers, the amount of time a worker will try to reconnect to start work
+- `TEST_QUEUE_RELAY_TOKEN`: when using remote workers, this must be the same on both workers and the server for remote workers to run tests.
+- `TEST_QUEUE_SLAVE_MESSAGE`: when using remote workers, set this on a slave worker and it will appear on the slave's connection message on the master.
 
 ### usage
 
@@ -75,6 +78,9 @@ class MyAppTestRunner < TestQueue::Runner::MiniTest
     concurrency.times do |i|
       # ...
     end
+
+    # If this is a remote slave, tell the master something about us
+    @slave_message = "Output for slave 123: http://myhost.com/build/123"
   end
 
   def around_filter(suite)
@@ -90,11 +96,13 @@ CustomMiniTestRunner.new.execute
 ### distributed mode
 
 To use distributed mode, the central master must listen on a tcp port. Additional masters can be booted
-in relay mode to connect to the central master.
+in relay mode to connect to the central master. Workers must provide a TEST_QUEUE_RELAY_TOKEN to match
+the master's.
 
 ```
-$ TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_test.rb
-$ TEST_QUEUE_RELAY=0.0.0.0:12345  bundle exec minitest-queue ./test/sample_test.rb
+$ TEST_QUEUE_RELAY_TOKEN=123 TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_test.rb
+$ TEST_QUEUE_RELAY_TOKEN=123 TEST_QUEUE_RELAY=0.0.0.0:12345  bundle exec minitest-queue ./test/sample_test.rb
+$ TEST_QUEUE_RELAY_TOKEN=123 ./test-multi.sh
 ```
 
 See the [Parameterized Trigger Plugin](https://wiki.jenkins-ci.org/display/JENKINS/Parameterized+Trigger+Plugin)

data/lib/test_queue/iterator.rb

@@ -16,7 +16,7 @@ module TestQueue
     end
 
     def each
-      fail 'already used this iterator' if @done
+      fail "already used this iterator. previous caller: #@done" if @done
 
       while true
         client = connect_to_master('POP')
@@ -44,7 +44,7 @@ module TestQueue
       end
     rescue Errno::ENOENT, Errno::ECONNRESET, Errno::ECONNREFUSED
     ensure
-      @done = true
+      @done = caller.first
       File.open("/tmp/test_queue_worker_#{$$}_stats", "wb") do |f|
         f.write Marshal.dump(@stats)
       end

data/lib/test_queue/runner.rb

@@ -1,10 +1,12 @@
 require 'socket'
 require 'fileutils'
+require 'securerandom'
 
 module TestQueue
   class Worker
     attr_accessor :pid, :status, :output, :stats, :num, :host
     attr_accessor :start_time, :end_time
+    attr_accessor :summary, :failure_output
 
     def initialize(pid, num)
       @pid = pid
@@ -50,6 +52,12 @@ module TestQueue
           2
         end
 
+      @slave_connection_timeout =
+        (ENV['TEST_QUEUE_RELAY_TIMEOUT'] && ENV['TEST_QUEUE_RELAY_TIMEOUT'].to_i) ||
+        30
+
+      @run_token = ENV['TEST_QUEUE_RELAY_TOKEN'] || SecureRandom.hex(8)
+
       @socket =
         socket ||
         ENV['TEST_QUEUE_SOCKET'] ||
@@ -59,6 +67,8 @@ module TestQueue
         relay ||
         ENV['TEST_QUEUE_RELAY']
 
+      @slave_message = ENV["TEST_QUEUE_SLAVE_MESSAGE"] if ENV.has_key?("TEST_QUEUE_SLAVE_MESSAGE")
+
       if @relay == @socket
         STDERR.puts "*** Detected TEST_QUEUE_RELAY == TEST_QUEUE_SOCKET. Disabling relay mode."
         @relay = nil
@@ -94,12 +104,12 @@ module TestQueue
 
       @failures = ''
       @completed.each do |worker|
-        summary, failures = summarize_worker(worker)
-        @failures << failures if failures
+        summarize_worker(worker)
+        @failures << worker.failure_output if worker.failure_output
 
         puts "    [%2d] %60s      %4d suites in %.4fs      (pid %d exit %d%s)" % [
           worker.num,
-          summary,
+          worker.summary,
           worker.stats.size,
           worker.end_time - worker.start_time,
           worker.pid,
@@ -183,7 +193,15 @@ module TestQueue
       return unless relay?
 
       sock = connect_to_relay
-      sock.puts("SLAVE #{@concurrency} #{Socket.gethostname}")
+      message = " #{@slave_message}" if @slave_message
+      message.gsub!(/(\r|\n)/, "") # Our "protocol" is newline-separated
+      sock.puts("SLAVE #{@concurrency} #{Socket.gethostname} #{@run_token}#{message}")
+      response = sock.gets.strip
+      unless response == "OK"
+        STDERR.puts "*** Got non-OK response from master: #{response}"
+        sock.close
+        exit! 1
+      end
       sock.close
     rescue Errno::ECONNREFUSED
       STDERR.puts "*** Unable to connect to relay #{@relay}. Aborting.."
@@ -209,7 +227,7 @@ module TestQueue
           after_fork_internal(num, iterator)
           ret = run_worker(iterator) || 0
           cleanup_worker
-          exit! ret
+          Kernel.exit! ret
         end
 
         @workers[pid] = Worker.new(pid, num)
@@ -233,6 +251,9 @@ module TestQueue
       after_fork(num)
     end
 
+    # Run in the master before the fork. Used to create
+    # concurrency copies of any databases required by the
+    # test workers.
     def prepare(concurrency)
     end
 
@@ -240,9 +261,15 @@ module TestQueue
       yield
     end
 
+    # Prepare a worker for executing jobs after a fork.
     def after_fork(num)
     end
 
+    # Entry point for internal runner implementations. The iterator will yield
+    # jobs from the shared queue on the master.
+    #
+    # Returns nothing. exits 0 on success.
+    # exits N on error, where N is the number of failures.
     def run_worker(iterator)
       iterator.each do |item|
         puts "  #{item.inspect}"
@@ -255,10 +282,8 @@ module TestQueue
     end
 
     def summarize_worker(worker)
-      num_tests = ''
-      failures = ''
-
-      [ num_tests, failures ]
+      worker.summary = ''
+      worker.failure_output = ''
     end
 
     def reap_worker(blocking=true)
@@ -297,16 +322,28 @@ module TestQueue
           sock = @server.accept
           cmd = sock.gets.strip
           case cmd
-          when 'POP'
+          when /^POP/
+            # If we have a slave from a different test run, don't respond, and it will consider the test run done.
             if obj = @queue.shift
               data = Marshal.dump(obj.to_s)
               sock.write(data)
             end
-          when /^SLAVE (\d+) ([\w\.-]+)/
+          when /^SLAVE (\d+) ([\w\.-]+) (\w+)(?: (.+))?/
             num = $1.to_i
             slave = $2
-            remote_workers += num
-            STDERR.puts "*** #{num} workers connected from #{slave} after #{Time.now-@start_time}s"
+            run_token = $3
+            slave_message = $4
+            if run_token == @run_token
+              # If we have a slave from a different test run, don't respond, and it will consider the test run done.
+              sock.write("OK\n")
+              remote_workers += num
+            else
+              STDERR.puts "*** Worker from run #{run_token} connected to master for run #{@run_token}; ignoring."
+              sock.write("WRONG RUN\n")
+            end
+            message = "*** #{num} workers connected from #{slave} after #{Time.now-@start_time}s"
+            message << " " + slave_message if slave_message
+            STDERR.puts message
           when /^WORKER (\d+)/
             data = sock.read($1.to_i)
             worker = Marshal.load(data)
@@ -329,7 +366,19 @@ module TestQueue
     end
 
     def connect_to_relay
-      TCPSocket.new(*@relay.split(':'))
+      sock = nil
+      start = Time.now
+      puts "Attempting to connect for #{@slave_connection_timeout}s..."
+      while sock.nil?
+        begin
+          sock = TCPSocket.new(*@relay.split(':'))
+        rescue Errno::ECONNREFUSED => e
+          raise e if Time.now - start > @slave_connection_timeout
+          puts "Master not yet available, sleeping..."
+          sleep 0.5
+        end
+      end
+      sock
     end
 
     def relay_to_master(worker)

data/lib/test_queue/runner/cucumber.rb

@@ -38,10 +38,8 @@ module TestQueue
         end
 
         output = worker.output.gsub(/\e\[\d+./,'')
-        summary  = output.split("\n").grep(/^\d+ (scenarios?|steps?)/).first
-        failures = output.scan(/^Failing Scenarios:\n(.*)\n\d+ scenarios?/m).join("\n")
-
-        [ summary, failures ]
+        worker.summary  = output.split("\n").grep(/^\d+ (scenarios?|steps?)/).first
+        worker.failure_output = output.scan(/^Failing Scenarios:\n(.*)\n\d+ scenarios?/m).join("\n")
       end
     end
   end

data/lib/test_queue/runner/minitest.rb

@@ -1,71 +1,24 @@
-require 'test_queue/runner'
-require 'minitest/unit'
-require 'stringio'
-
-class MiniTestQueueRunner < MiniTest::Unit
-  def _run_suites(*)
-    self.class.output = $stdout
-    super
-  end
-
-  def _run_anything(*)
-    ret = super
-    output.puts
-    ret
-  end
-
-  def _run_suite(suite, type)
-    output.print '    '
-    output.print suite
-    output.print ': '
-
-    start = Time.now
-    ret = super
-    diff = Time.now - start
-
-    output.puts("  <%.3f>" % diff)
-    ret
-  end
-
-  self.runner = self.new
-  self.output = StringIO.new
-end
-
-class MiniTest::Unit::TestCase
-  class << self
-    attr_accessor :test_suites
-
-    def original_test_suites
-      @@test_suites.keys.reject{ |s| s.test_methods.empty? }
-    end
-  end
+begin
+  require 'minitest'
+  require 'test_queue/runner/minitest5'
+rescue LoadError => e
+  require 'minitest/unit'
+  require 'test_queue/runner/minitest4'
 end
 
 module TestQueue
   class Runner
     class MiniTest < Runner
-      def initialize
-        tests = ::MiniTest::Unit::TestCase.original_test_suites.sort_by{ |s| -(stats[s.to_s] || 0) }
-        super(tests)
-      end
-
-      def run_worker(iterator)
-        ::MiniTest::Unit::TestCase.test_suites = iterator
-        ::MiniTest::Unit.new.run
-      end
-
       def summarize_worker(worker)
         worker.stats.each do |s, val|
           stats[s.to_s] = val
         end
 
-        num_tests = worker.lines.grep(/, \d+ errors?, /).first
+        worker.summary = worker.lines.grep(/, \d+ errors?, /).first
         failures  = worker.lines.select{ |line|
           line if (line =~ /^Finished/) ... (line =~ /, \d+ errors?, /)
         }[1..-2]
-        failures = failures.join("\n") if failures
-
-        [ num_tests, failures ]
+        worker.failure_output = failures.join("\n") if failures
       end
     end
   end

data/lib/test_queue/runner/minitest4.rb

@@ -0,0 +1,65 @@
+require 'test_queue/runner'
+require 'stringio'
+
+class MiniTestQueueRunner < MiniTest::Unit
+  def _run_suites(suites, type)
+    self.class.output = $stdout
+
+    if defined?(ParallelEach)
+      # Ignore its _run_suites implementation since we don't handle it gracefully.
+      # If we don't do this #partition is called on the iterator and all suites
+      # distributed immediately, instead of picked up as workers are available.
+      suites.map { |suite| _run_suite suite, type }
+    else
+      super
+    end
+  end
+
+  def _run_anything(*)
+    ret = super
+    output.puts
+    ret
+  end
+
+  def _run_suite(suite, type)
+    output.print '    '
+    output.print suite
+    output.print ': '
+
+    start = Time.now
+    ret = super
+    diff = Time.now - start
+
+    output.puts("  <%.3f>" % diff)
+    ret
+  end
+
+  self.runner = self.new
+  self.output = StringIO.new
+end
+
+class MiniTest::Unit::TestCase
+  class << self
+    attr_accessor :test_suites
+
+    def original_test_suites
+      @@test_suites.keys.reject{ |s| s.test_methods.empty? }
+    end
+  end
+end
+
+module TestQueue
+  class Runner
+    class MiniTest < Runner
+      def initialize
+        tests = ::MiniTest::Unit::TestCase.original_test_suites.sort_by{ |s| -(stats[s.to_s] || 0) }
+        super(tests)
+      end
+
+      def run_worker(iterator)
+        ::MiniTest::Unit::TestCase.test_suites = iterator
+        ::MiniTest::Unit.new.run
+      end
+    end
+  end
+end

data/lib/test_queue/runner/minitest5.rb

@@ -0,0 +1,71 @@
+require 'test_queue/runner'
+
+module MiniTest
+  def self.__run reporter, options
+    suites = Runnable.runnables
+
+    # Run the serial tests first after they complete, run the parallels tests
+    # We already sort suites based on its test_order at TestQueue::Runner::Minitest#initialize.
+    suites.map { |suite| suite.run reporter, options }
+  end
+
+  class Test
+    def self.runnables= runnables
+      @@orig_runnables = @@runnables
+      @@runnables = runnables
+    end
+    def self.orig_runnables
+      @@orig_runnables
+    end
+  end
+
+  class ProgressReporter
+    # Override original method to make test-queue specific output
+    def record result
+      io.print '    '
+      io.print result.class
+      io.print ': '
+      io.print result.result_code
+      io.puts("  <%.3f>" % result.time)
+    end
+  end
+
+  begin
+    require 'minitest/minitest_reporter_plugin'
+
+    class << self
+      private
+      def total_count(options)
+        filter = options[:filter] || '/./'
+        filter = Regexp.new $1 if filter =~ /\/(.*)\//
+
+        Minitest::Test.orig_runnables.map(&:runnable_methods).flatten.find_all { |m|
+          filter === m || filter === "#{self}##{m}"
+        }.size
+      end
+    end
+  rescue LoadError
+  end
+end
+
+module TestQueue
+  class Runner
+    class MiniTest < Runner
+      def initialize
+        tests = ::MiniTest::Test.runnables.reject { |s|
+          s.runnable_methods.empty?
+        }.sort_by { |s|
+          -(stats[s.to_s] || 0)
+        }.partition { |s|
+          s.test_order == :parallel
+        }.reverse.flatten
+        super(tests)
+      end
+
+      def run_worker(iterator)
+        ::MiniTest::Test.runnables = iterator
+        ::MiniTest.run ? 0 : 1
+      end
+    end
+  end
+end

data/lib/test_queue/runner/puppet_lint.rb

@@ -23,9 +23,8 @@ module TestQueue
         errors   = lines.select{ |line| line =~ /^ERROR/ }
         warnings = lines.select{ |line| line =~ /^WARNING/ }
 
-        summary = "#{files.size} files, #{warnings.size} warnings, #{errors.size} errors"
-
-        [summary, errors.join("\n")]
+        worker.summary = "#{files.size} files, #{warnings.size} warnings, #{errors.size} errors"
+        worker.failure_output = errors.join("\n")
       end
     end
   end

data/lib/test_queue/runner/rspec.rb

@@ -1,40 +1,13 @@
 require 'test_queue/runner'
 require 'rspec/core'
 
-module RSpec::Core
-  class QueueRunner < CommandLine
-    def initialize
-      super(ARGV)
-      @configuration.output_stream = $stdout
-      @configuration.error_stream  = $stderr
-    end
-
-    def example_groups
-      @options.configure(@configuration)
-      @configuration.load_spec_files
-      @world.announce_filters
-      @world.example_groups
-    end
-
-    def run_each(iterator)
-      @configuration.reporter.report(0, @configuration.randomize? ? @configuration.seed : nil) do |reporter|
-        begin
-          @configuration.run_hook(:before, :suite)
-          iterator.map {|g|
-            print "    #{g.description}: "
-            start = Time.now
-            ret = g.run(reporter)
-            diff = Time.now-start
-            puts("  <%.3f>" % diff)
-
-            ret
-          }.all? ? 0 : @configuration.failure_exit_code
-        ensure
-          @configuration.run_hook(:after, :suite)
-        end
-      end
-    end
-  end
+case ::RSpec::Core::Version::STRING.to_i
+when 2
+  require_relative 'rspec2'
+when 3
+  require_relative 'rspec3'
+else
+  fail 'requires rspec version 2 or 3'
 end
 
 module TestQueue
@@ -46,7 +19,7 @@ module TestQueue
       end
 
       def run_worker(iterator)
-        @rspec.run_each(iterator)
+        @rspec.run_each(iterator).to_i
       end
 
       def summarize_worker(worker)
@@ -54,10 +27,8 @@ module TestQueue
           stats[s] = val
         end
 
-        summary  = worker.lines.grep(/ examples?, /).first
-        failures = worker.output[/^Failures:\n\n(.*)\n^Finished/m, 1]
-
-        [ summary, failures ]
+        worker.summary  = worker.lines.grep(/ examples?, /).first
+        worker.failure_output = worker.output[/^Failures:\n\n(.*)\n^Finished/m, 1]
       end
     end
   end

data/lib/test_queue/runner/rspec2.rb

@@ -0,0 +1,35 @@
+module RSpec::Core
+  class QueueRunner < CommandLine
+    def initialize
+      super(ARGV)
+      @configuration.output_stream = $stdout
+      @configuration.error_stream  = $stderr
+    end
+
+    def example_groups
+      @options.configure(@configuration)
+      @configuration.load_spec_files
+      @world.announce_filters
+      @world.example_groups
+    end
+
+    def run_each(iterator)
+      @configuration.reporter.report(0, @configuration.randomize? ? @configuration.seed : nil) do |reporter|
+        begin
+          @configuration.run_hook(:before, :suite)
+          iterator.map {|g|
+            print "    #{g.description}: "
+            start = Time.now
+            ret = g.run(reporter)
+            diff = Time.now-start
+            puts("  <%.3f>" % diff)
+
+            ret
+          }.all? ? 0 : @configuration.failure_exit_code
+        ensure
+          @configuration.run_hook(:after, :suite)
+        end
+      end
+    end
+  end
+end

data/lib/test_queue/runner/rspec3.rb

@@ -0,0 +1,35 @@
+module RSpec::Core
+  class QueueRunner < Runner
+    def initialize
+      options = ::RSpec::Core::ConfigurationOptions.new(ARGV)
+      super(options)
+    end
+
+    def example_groups
+      setup($stderr, $stdout)
+      @world.ordered_example_groups
+    end
+
+    def run_specs(iterator)
+      @configuration.reporter.report(@world.ordered_example_groups.count) do |reporter|
+        begin
+          hook_context = SuiteHookContext.new
+          @configuration.hooks.run(:before, :suite, hook_context)
+
+          iterator.map { |g|
+            print "    #{g.description}: "
+            start = Time.now
+            ret = g.run(reporter)
+            diff = Time.now-start
+            puts("  <%.3f>" % diff)
+
+            ret
+          }.all? ? 0 : @configuration.failure_exit_code
+        ensure
+          @configuration.hooks.run(:after, :suite, hook_context)
+        end
+      end
+    end
+    alias_method :run_each, :run_specs
+  end
+end

data/lib/test_queue/runner/sample.rb

@@ -26,10 +26,8 @@ module TestQueue
       def summarize_worker(worker)
         stats.update(worker.stats)
 
-        summary  = worker.output.scan(/^\s*(\d+)/).join(', ')
-        failures = ''
-
-        [ summary, failures ]
+        worker.summary  = worker.output.scan(/^\s*(\d+)/).join(', ')
+        worker.failure_output = ''
       end
     end
   end

data/test-multi.sh

@@ -2,7 +2,7 @@
 set -x
 
 # export TEST_QUEUE_VERBOSE=1
-TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_test.rb &
+TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_minitest5.rb &
 sleep 0.1
-TEST_QUEUE_RELAY=0.0.0.0:12345  bundle exec minitest-queue ./test/sample_test.rb
+TEST_QUEUE_RELAY=0.0.0.0:12345  bundle exec minitest-queue ./test/sample_minitest5.rb
 wait

data/test-queue.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'test-queue'
-  s.version = '0.2.9'
+  s.version = '0.2.10'
   s.summary = 'parallel test runner'
   s.description = 'minitest/rspec parallel test runner for CI environments'
 
@@ -16,8 +16,8 @@ spec = Gem::Specification.new do |s|
   s.executables << 'minitest-queue'
   s.executables << 'cucumber-queue'
 
-  s.add_development_dependency 'rspec', '~> 2.13'
-  s.add_development_dependency 'minitest', '~> 4.7.3'
+  s.add_development_dependency 'rspec', '>= 2.13', '< 4.0'
+  s.add_development_dependency 'minitest', '>= 4.7.3'
   s.add_development_dependency 'cucumber', '~> 1.3.10'
 
   s.files = `git ls-files`.split("\n")

data/test.sh

@@ -3,9 +3,15 @@ set -x
 
 export TEST_QUEUE_WORKERS=2 TEST_QUEUE_VERBOSE=1
 
+bundle install --gemfile=Gemfile-minitest4
+bundle exec minitest-queue ./test/*_minitest4.rb
+bundle exec minitest-queue ./test/*_minispec.rb
+
+bundle install
+bundle exec minitest-queue ./test/*_minitest4.rb
+bundle exec minitest-queue ./test/*_minitest5.rb
 bundle exec minitest-queue ./test/*_minispec.rb
-bundle exec minitest-queue ./test/*_test.rb
 bundle exec rspec-queue test
 bundle exec cucumber-queue
 
-TEST_QUEUE_WORKERS=1 TEST_QUEUE_FORCE="MiniTestSleep21,MiniTestSleep8,MiniTestFailure" bundle exec minitest-queue ./test/*_test.rb
+TEST_QUEUE_WORKERS=1 TEST_QUEUE_FORCE="MiniTestSleep21,MiniTestSleep8,MiniTestFailure" bundle exec minitest-queue ./test/*_minitest5.rb

data/test/sample_minitest5.rb

@@ -0,0 +1,23 @@
+require 'minitest/autorun'
+
+class MiniTestEqual < MiniTest::Test
+  def test_equal
+    assert_equal 1, 1
+  end
+end
+
+30.times do |i|
+  Object.const_set("MiniTestSleep#{i}", Class.new(MiniTest::Test) do
+    define_method('test_sleep') do
+      start = Time.now
+      sleep(0.25)
+      assert_in_delta Time.now-start, 0.25, 0.02
+    end
+  end)
+end
+
+class MiniTestFailure < MiniTest::Test
+  def test_fail
+    assert_equal 0, 1
+  end
+end

data/test/sample_spec.rb

@@ -2,7 +2,7 @@ require 'rspec'
 
 describe 'RSpecEqual' do
   it 'checks equality' do
-    1.should equal(1)
+    expect(1).to eq 1
   end
 end
 
@@ -11,13 +11,13 @@ end
     it "sleeps" do
       start = Time.now
       sleep(0.25)
-      (Time.now-start).should be_within(0.02).of(0.25)
+      expect(Time.now-start).to be_within(0.02).of(0.25)
     end
   end
 end
 
 describe 'RSpecFailure' do
   it 'fails' do
-    :foo.should eq(:bar)
+    expect(:foo).to eq :bar
   end
 end

metadata

@@ -1,46 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: test-queue
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
+  prerelease: 
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +60,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +75,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile-minitest4
+- Gemfile-minitest4.lock
 - Gemfile.lock
 - README.md
 - bin/cucumber-queue
@@ -77,38 +92,44 @@ files:
 - lib/test_queue/runner.rb
 - lib/test_queue/runner/cucumber.rb
 - lib/test_queue/runner/minitest.rb
+- lib/test_queue/runner/minitest4.rb
+- lib/test_queue/runner/minitest5.rb
 - lib/test_queue/runner/puppet_lint.rb
 - lib/test_queue/runner/rspec.rb
+- lib/test_queue/runner/rspec2.rb
+- lib/test_queue/runner/rspec3.rb
 - lib/test_queue/runner/sample.rb
 - test-multi.sh
 - test-queue.gemspec
 - test.sh
 - test/sample_minispec.rb
+- test/sample_minitest4.rb
+- test/sample_minitest5.rb
 - test/sample_spec.rb
-- test/sample_test.rb
 homepage: http://github.com/tmm1/test-queue
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: parallel test runner
 test_files: []
 has_rdoc: false

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjQ3ZGNkZDQ3OGNjMWU2YmIxZDU2NGZjOTZjYTk5ZTNhY2E4NzQxZQ==
-  data.tar.gz: !binary |-
-    MjJiZjRjM2M4Y2E0ODA5ZjQyYTJkMDkzOTM0MjA0Nzc2NjM1NDg3ZA==
-SHA512:
-  metadata.gz: !binary |-
-    MWYwODQ5NjBmMmEwMTNiYWFjZWQ1NGNmMTcyNjRiMWRhNDM4OWVkY2E3YTNi
-    NDViMTBjZDNjMGU1ZDc1MTNmYjIzYTMzNDViMzMyYmEyMjY1Mjk2MjFhYmIz
-    MTcxODg3NzA3MTI5MjkzMTc2MGRjMWNiNGIxOTNmYWFiMmI4MWE=
-  data.tar.gz: !binary |-
-    YzhhNTMxM2U3ZDNlNzg1YTcwY2Q4OTNiY2M1YTkwMmZlZTFhNjUzNTk5NzEw
-    MTk1YTNlZjZjYTcwMzhkNTM4MTQ5Yjg1ZjFjZWU4Y2MyOGY4MWFjNGRhOGZl
-    YTI2NWE5N2I2N2Y4MWVhMTEwZjA4ZWU0NjU0YWIwMGEzZjY1Njg=