selective-ruby-core 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6dbb5b565e9daa33dd9734e130efafcbb431372ee74eafc3b1e61356b94f2a
-  data.tar.gz: 9a4252a640d2a396d6d8b6cde0817566c9940ff569bceeb049260a062f6b9e73
+  metadata.gz: f410f920d6ebee58d8bd5baa92a50b85acde8ea3b4bd6d22591df39d7fd2d037
+  data.tar.gz: 6139327221ff4aa47f187ab663ac60c8854f97629981ed3f6d34dc2b12c37a0a
 SHA512:
-  metadata.gz: 5db64c1685e6c52cf3bca4d08c27b5cc3461f2162b8e9d587fd87872c7f73012d96a14c2260d7b2e6650661e6a07163a0ed379aa6019459beb91591e4ea79dcb
-  data.tar.gz: 4f0755272db64264a15727ce35a1d8a896953a0f192617d9b9eff0afbe46b3d8f7f1211e11de45cc4b9987e91d6b5092a6636024e6fefe1a240e585e63da2984
+  metadata.gz: 68b7dca7fd3b5388b94e0eb3218b3cbb5cffcb948a6f4110a84269c6b4ed062a40a1e282d9ecf6e101cc140732d0ecd561e34434f817f760442c7aeb76f385ba
+  data.tar.gz: 8765865c0b34d02ac2654620dcb597f56d4014e9df44eb2555917149d5526d2bdec9dbc9bea9a25026ed13a56220f29429f389105d3808747cb2ed99930db94a

data/lib/selective/ruby/core/controller.rb

@@ -29,15 +29,19 @@ module Selective
           @retries = 0
         end
 
+        # A lost connection is retried by looping here, not by calling start
+        # again from inside the rescue clause. Everything a reconnected runner
+        # does -- the rest of the run, the close, the framework's after_run
+        # hooks -- would otherwise run inside that clause, where `$!` is still
+        # the ConnectionLostError. SimpleCov's after_run hook reads that as the
+        # run having crashed and exits 1, so every CI shard whose connection
+        # dropped once failed with no failing test.
         def start(reconnect: false)
-          @pipe = NamedPipe.new("/tmp/#{runner_id}_2", "/tmp/#{runner_id}_1")
-          @transport_pid = spawn_transport_process(reconnect: reconnect)
+          loop do
+            break if connect_and_run(reconnect: reconnect)
 
-          handle_termination_signals(transport_pid)
-          wait_for_connectivity
-          run_main_loop
-        rescue ConnectionLostError
-          retry!
+            reconnect = true
+          end
         rescue => e
           with_error_handling { raise e }
         end
@@ -106,7 +110,22 @@ module Selective
           end
         end
 
-        def retry!
+        # One connection: true when the run finished on it, false when it was
+        # lost and the caller should reconnect.
+        def connect_and_run(reconnect:)
+          @pipe = NamedPipe.new("/tmp/#{runner_id}_2", "/tmp/#{runner_id}_1")
+          @transport_pid = spawn_transport_process(reconnect: reconnect)
+
+          handle_termination_signals(transport_pid)
+          wait_for_connectivity
+          run_main_loop
+          true
+        rescue ConnectionLostError
+          prepare_retry!
+          false
+        end
+
+        def prepare_retry!
           @retries += 1
 
           with_error_handling { raise "Too many retries" } if retries > 10
@@ -116,7 +135,6 @@ module Selective
           kill_transport
 
           pipe.reset!
-          start(reconnect: true)
         end
 
         def write(data)

data/lib/selective/ruby/core/version.rb

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Core
-      VERSION = "0.2.10"
+      VERSION = "0.2.11"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-core
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Benjamin Wood