test-queue 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c919d302e14f5b2acf5fe2311c3aa30591ba2ad
-  data.tar.gz: d47c906e667f8709b771667594c58bdb2d6f6abf
+SHA256:
+  metadata.gz: 4c32b025eec2391d8523ce84f4f180443b09f003f8770b8b27ff741aac464629
+  data.tar.gz: 6a18a116cba1ec57617f92405a5d4554dab34dc5ab41be6ed10825b9c8b9f503
 SHA512:
-  metadata.gz: 993127c3b76dc9855c1d0b3b38a85b5bea1e7a43fd5533a725b728c702bc34d8b1c503dddfae693d59381de8b44eceff39879751a15aeffc917376f94ac51c05
-  data.tar.gz: 0841ce47fbebdd598a6c61b60f235b091a005a94dddef5fc1d161535c59aaeb2a2ce1227a5d08d4401b2f29a090b957ebe24db1d3bc6d67ac6622b5ab3d23947
+  metadata.gz: c7be91c62fc0e8f47826b441ed36f08ce454caf53bb56af03b11a3f7ed0eb88028ecb7ec96b03baf413ef985401292fee055561e876012c88e7e63fc7007ae00
+  data.tar.gz: 27e6d8fbaf61bf96beede058ad5a25ae8695a88fb3ce3d14ba96666e8da2b1df066574aa7efa0f9bcd5cbd619d1825a0a8c4f4cbe20f0eb312b2f9692f7a3d49

data/Gemfile-cucumber1-3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-cucumber2-4.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-minitest4.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-minitest5.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-rspec2-1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-rspec3-0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-rspec3-1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-rspec3-2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile-testunit.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    test-queue (0.4.2)
+    test-queue (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Aman Gupta
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -35,9 +35,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.
+- `TEST_QUEUE_RELAY_TIMEOUT`: when using distributed builds, the amount of time a remote master will try to reconnect to start work
+- `TEST_QUEUE_RELAY_TOKEN`: when using distributed builds, this must be the same on remote masters and the central master for remote masters to be able to connect.
+- `TEST_QUEUE_REMOTE_MASTER_MESSAGE`: when using distributed builds, set this on a remote master and it will appear in that master's connection message on the central master.
 - `TEST_QUEUE_SPLIT_GROUPS`: split tests up by example rather than example group. Faster for tests with short setup time such as selenium. RSpec only. Add the :no_split tag to ExampleGroups you don't want split.
 
 ### usage
@@ -83,8 +83,8 @@ class MyAppTestRunner < TestQueue::Runner::MiniTest
       # ...
     end
 
-    # If this is a remote slave, tell the master something about us
-    @slave_message = "Output for slave 123: http://myhost.com/build/123"
+    # If this is a remote master, tell the central master something about us
+    @remote_master_message = "Output for remote master 123: http://myhost.com/build/123"
   end
 
   def around_filter(suite)
@@ -100,8 +100,8 @@ MyAppTestRunner.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. Workers must provide a TEST_QUEUE_RELAY_TOKEN to match
-the master's.
+in relay mode to connect to the central master. Remote masters must provide a TEST_QUEUE_RELAY_TOKEN
+to match the central master's.
 
 ```
 $ TEST_QUEUE_RELAY_TOKEN=123 TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec minitest-queue ./test/sample_test.rb

data/lib/test_queue/runner/rspec.rb

@@ -10,12 +10,6 @@ else
   fail 'requires rspec version 2 or 3'
 end
 
-class ::RSpec::Core::ExampleGroup
-  def self.failure_count
-    examples.map {|e| e.execution_result[:status] == "failed"}.length
-  end
-end
-
 module TestQueue
   class Runner
     class RSpec < Runner
@@ -53,6 +47,8 @@ module TestQueue
                    example_or_group.id
                  elsif example_or_group.respond_to?(:full_description)
                    example_or_group.full_description
+                 elsif example_or_group.metadata.key?(:full_description)
+                   example_or_group.metadata[:full_description]
                  else
                    example_or_group.metadata[:example_group][:full_description]
                  end

data/lib/test_queue/runner/rspec2.rb

@@ -1,3 +1,9 @@
+class ::RSpec::Core::ExampleGroup
+  def self.failure_count
+    examples.map {|e| e.execution_result[:status] == "failed"}.length
+  end
+end
+
 module RSpec::Core
   class QueueRunner < CommandLine
     def initialize

data/lib/test_queue/runner/rspec3.rb

@@ -1,3 +1,9 @@
+class ::RSpec::Core::ExampleGroup
+  def self.failure_count
+    examples.map {|e| e.execution_result.status == "failed"}.length
+  end
+end
+
 module RSpec::Core
   # RSpec 3.2 introduced:
   unless Configuration.method_defined?(:with_suite_hooks)

data/lib/test_queue/runner.rb

@@ -37,6 +37,7 @@ module TestQueue
       @test_framework = test_framework
       @stats = Stats.new(stats_file)
 
+      @early_failure_limit = nil
       if ENV['TEST_QUEUE_EARLY_FAILURE_LIMIT']
         begin
           @early_failure_limit = Integer(ENV['TEST_QUEUE_EARLY_FAILURE_LIMIT'])
@@ -85,7 +86,7 @@ module TestQueue
         raise ArgumentError, "Worker count (#{@concurrency}) must be greater than 0"
       end
 
-      @slave_connection_timeout =
+      @relay_connection_timeout =
         (ENV['TEST_QUEUE_RELAY_TIMEOUT'] && ENV['TEST_QUEUE_RELAY_TIMEOUT'].to_i) ||
         30
 
@@ -100,7 +101,12 @@ module TestQueue
         relay ||
         ENV['TEST_QUEUE_RELAY']
 
-      @slave_message = ENV["TEST_QUEUE_SLAVE_MESSAGE"] if ENV.has_key?("TEST_QUEUE_SLAVE_MESSAGE")
+      @remote_master_message = if ENV.has_key?("TEST_QUEUE_REMOTE_MASTER_MESSAGE")
+                                 ENV["TEST_QUEUE_REMOTE_MASTER_MESSAGE"]
+                               elsif ENV.has_key?("TEST_QUEUE_SLAVE_MESSAGE")
+                                 warn("`TEST_QUEUE_SLAVE_MESSAGE` is deprecated. Use `TEST_QUEUE_REMOTE_MASTER_MESSAGE` instead.")
+                                 ENV["TEST_QUEUE_SLAVE_MESSAGE"]
+                               end
 
       if @relay == @socket
         STDERR.puts "*** Detected TEST_QUEUE_RELAY == TEST_QUEUE_SOCKET. Disabling relay mode."
@@ -265,10 +271,10 @@ module TestQueue
       return unless relay?
 
       sock = connect_to_relay
-      message = @slave_message ? " #{@slave_message}" : ""
+      message = @remote_master_message ? " #{@remote_master_message}" : ""
       message.gsub!(/(\r|\n)/, "") # Our "protocol" is newline-separated
       sock.puts("TOKEN=#{@run_token}")
-      sock.puts("SLAVE #{@concurrency} #{Socket.gethostname} #{message}")
+      sock.puts("REMOTE MASTER #{@concurrency} #{Socket.gethostname} #{message}")
       response = sock.gets.strip
       unless response == "OK"
         STDERR.puts "*** Got non-OK response from master: #{response}"
@@ -485,7 +491,7 @@ module TestQueue
           cmd = sock.gets.strip
 
           token = token[TOKEN_REGEX, 1]
-          # If we have a slave from a different test run, respond with "WRONG RUN", and it will consider the test run done.
+          # If we have a remote master from a different test run, respond with "WRONG RUN", and it will consider the test run done.
           if token != @run_token
             message = token.nil? ? "Worker sent no token to master" : "Worker from run #{token} connected to master"
             STDERR.puts "*** #{message} for run #{@run_token}; ignoring."
@@ -495,7 +501,6 @@ module TestQueue
 
           case cmd
           when /^POP (\S+) (\d+)/
-            # If we have a slave from a different test run, don't respond, and it will consider the test run done.
             hostname = $1
             pid = Integer($2)
             if awaiting_suites?
@@ -505,16 +510,16 @@ module TestQueue
               sock.write(data)
               @assignments[obj] = [hostname, pid]
             end
-          when /^SLAVE (\d+) ([\w\.-]+)(?: (.+))?/
+          when /^REMOTE MASTER (\d+) ([\w\.-]+)(?: (.+))?/
             num = $1.to_i
-            slave = $2
-            slave_message = $3
+            remote_master = $2
+            remote_master_message = $3
 
             sock.write("OK\n")
             remote_workers += num
 
-            message = "*** #{num} workers connected from #{slave} after #{Time.now-@start_time}s"
-            message << " " + slave_message if slave_message
+            message = "*** #{num} workers connected from #{remote_master} after #{Time.now-@start_time}s"
+            message << " " + remote_master_message if remote_master_message
             STDERR.puts message
           when /^WORKER (\d+)/
             data = sock.read($1.to_i)
@@ -546,12 +551,12 @@ module TestQueue
     def connect_to_relay
       sock = nil
       start = Time.now
-      puts "Attempting to connect for #{@slave_connection_timeout}s..."
+      puts "Attempting to connect for #{@relay_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
+          raise e if Time.now - start > @relay_connection_timeout
           puts "Master not yet available, sleeping..."
           sleep 0.5
         end

data/test/minitest5.bats

@@ -128,6 +128,16 @@ assert_test_queue_force_ordering() {
   assert_output_contains "MiniTestFailure#test_fail"
 }
 
+@test "multi-master central master prints out remote master messages" {
+  export TEST_QUEUE_RELAY_TOKEN=$(date | cksum | cut -d' ' -f1)
+  TEST_QUEUE_RELAY=0.0.0.0:12345 TEST_QUEUE_REMOTE_MASTER_MESSAGE="hello from remote master" bundle exec minitest-queue ./test/samples/sample_minitest5.rb &
+  TEST_QUEUE_SOCKET=0.0.0.0:12345 run bundle exec minitest-queue ./test/samples/sample_minitest5.rb
+  wait
+
+  assert_status 0
+  assert_output_contains "hello from remote master"
+}
+
 @test "recovers from child processes dying in an unorderly way" {
   export KILL=1
   run bundle exec minitest-queue ./test/samples/sample_minitest5.rb

data/test-queue.gemspec

@@ -1,16 +1,15 @@
 spec = Gem::Specification.new do |s|
   s.name = 'test-queue'
-  s.version = '0.4.2'
+  s.version = '0.5.0'
   s.summary = 'parallel test runner'
   s.description = 'minitest/rspec parallel test runner for CI environments'
 
-  s.homepage = "http://github.com/tmm1/test-queue"
+  s.homepage = "https://github.com/tmm1/test-queue"
 
   s.authors = ["Aman Gupta"]
   s.email = "ruby@tmm1.net"
   s.license = 'MIT'
 
-  s.has_rdoc = false
   s.bindir = 'bin'
   s.executables << 'rspec-queue'
   s.executables << 'minitest-queue'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-queue
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Aman Gupta
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2022-07-16 00:00:00.000000000 Z
 dependencies: []
 description: minitest/rspec parallel test runner for CI environments
 email: ruby@tmm1.net
@@ -42,6 +42,7 @@ files:
 - Gemfile-testunit
 - Gemfile-testunit.lock
 - Gemfile.lock
+- LICENSE
 - README.md
 - bin/cucumber-queue
 - bin/minitest-queue
@@ -89,11 +90,11 @@ files:
 - test/sleepy_runner.rb
 - test/testlib.bash
 - test/testunit.bats
-homepage: http://github.com/tmm1/test-queue
+homepage: https://github.com/tmm1/test-queue
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: parallel test runner
 test_files: []